3 files changed, 2 insertions, 59 deletions
diff --git a/roles/nextcloud/templates/apache-site.conf.j2 b/roles/nextcloud/templates/apache-site.conf.j2
index 457cdfd4..a52a7fc5 100644
--- a/roles/nextcloud/templates/apache-site.conf.j2
+++ b/roles/nextcloud/templates/apache-site.conf.j2
@@ -1,18 +1,10 @@
-Include mods-available/socache_shmcb.load
-Include mods-available/ssl.load
-Include mods-available/ssl.conf
-
-<VirtualHost *:8443>
+<VirtualHost *:8080>
   ServerAdmin webmaster@localhost
   DocumentRoot /var/www/html
 
   UseCanonicalName Off
   UseCanonicalPhysicalPort Off
 
-  SSLEngine On
-  SSLCertificateFile    /etc/apache2/tls/nextcloud.crt
-  SSLCertificateKeyFile /etc/apache2/tls/nextcloud.key
-
   ErrorLog ${APACHE_LOG_DIR}/error.log
   CustomLog ${APACHE_LOG_DIR}/access.log combined
 </VirtualHost>
diff --git a/roles/nextcloud/templates/nginx-vhost.conf.j2 b/roles/nextcloud/templates/nginx-vhost.conf.j2
deleted file mode 100644
index 717c0dea..00000000
--- a/roles/nextcloud/templates/nginx-vhost.conf.j2
+++ /dev/null
@@ -1,45 +0,0 @@
-server {
-    listen 80;
-    listen [::]:80;
-    server_name {{ item.value.hostnames | join(' ') }};
-
-    include snippets/acmetool.conf;
-
-    location / {
-        return 301 https://$host$request_uri;
-    }
-}
-
-server {
-    listen 443 ssl http2;
-    listen [::]:443 ssl http2;
-    server_name {{ item.value.hostnames | join(' ') }};
-
-    include snippets/acmetool.conf;
-    include snippets/ssl.conf;
-    ssl_certificate     /var/lib/acme/live/{{ item.value.hostnames[0] }}/fullchain;
-    ssl_certificate_key /var/lib/acme/live/{{ item.value.hostnames[0] }}/privkey;
-    include snippets/hsts.conf;
-
-    location / {
-        include snippets/proxy-nobuff.conf;
-        client_max_body_size 512M;
-
-        proxy_set_header Host $host:443;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header X-Forwarded-Proto $scheme;
-        proxy_set_header X-Forwarded-Ssl on;
-        proxy_set_header X-Forwarded-Port $server_port;
-
-        # for websockets
-        proxy_set_header Upgrade $http_upgrade;
-        proxy_set_header Connection $connection_upgrade;
-
-        proxy_ssl_trusted_certificate /srv/storage/nextcloud/{{ item.key }}/config/tls/nextcloud.crt;
-        proxy_ssl_verify on;
-        proxy_ssl_name nextcloud-{{ item.key }};
-
-        proxy_pass https://127.0.0.1:{{ item.value.port }};
-    }
-}
diff --git a/roles/nextcloud/templates/pod-with-mariadb.yml.j2 b/roles/nextcloud/templates/pod-with-mariadb.yml.j2
index 92347a44..cebcb2ef 100644
--- a/roles/nextcloud/templates/pod-with-mariadb.yml.j2
+++ b/roles/nextcloud/templates/pod-with-mariadb.yml.j2
@@ -38,12 +38,8 @@ spec:
       mountPath: /etc/apache2/ports.conf
       subPath: ports.conf
       readOnly: true
-    - name: config
-      mountPath: /etc/apache2/tls/
-      subPath: tls
-      readOnly: true
     ports:
-    - containerPort: 8443
+    - containerPort: 8080
       hostPort: {{ item.value.port }}
   - name: database
     image: "mariadb:{{ item.value.database.version }}"