proxy_resources/etc/wireguard/wg0.conf

@@ -56,9 +56,9 @@ AllowedIPs = 10.0.0.8/32
 PersistentKeepalive = 25
 
 
-# Connection to backend server for nagios
+# Connection to backend server for icinga2
 [Peer]
-PublicKey = {{ nagios_backend_pubkey }}
+PublicKey = {{ icinga2_backend_pubkey }}
 AllowedIPs = 10.0.0.198/32
 PersistentKeepalive = 25
 

serversecrets.example

@@ -32,7 +32,7 @@ nextcloud_service_privkey: temp
 matrix_service_privkey: temp 
 minecraft_service_privkey: temp 
 kimai_service_privkey: temp
-nagios_backend_privkey: temp
+icinga2_backend_privkey: temp
 cockpit_backend_privkey: temp
 user_privkey: temp
 
@@ -45,7 +45,7 @@ nextcloud_service_pubkey: temp
 matrix_service_pubkey: temp
 minecraft_service_pubkey: temp
 kimai_service_pubkey: temp
-nagios_backend_pubkey: temp
+icinga2_backend_pubkey: temp
 cockpit_backend_pubkey: temp
 user_pubkey: temp
 

services/service_nextcloud/docker-compose.yml

@@ -21,20 +21,13 @@ services:
       - FIREWALL_INPUT_PORTS=11000,80,9000,6379,5432
         # volumes:
       # Custom IPTables forwarding rules to forward TCP(web) traffic from port 11000 to port 80
-<<<<<<< HEAD
-       - ./post-rules.txt:/iptables/post-rules.txt
-      #ports:
-      #  - "80:11000"
-=======
       # - ./post-rules.txt:/iptables/post-rules.txt
     ports:
       - "80:11000"
->>>>>>> 62bffc7d6ecfa5d2eee4efd93e29bcd8b5ff6d24
     deploy:
-      resources:
+      limits:
-        limits:
+        cpus: '0.10'
-          cpus: '0.10'
+        memory: 512M
-          memory: 512M
 
   nextcloud-cache:
     network_mode: "service:nextcloud-gluetun"
@@ -44,10 +37,9 @@ services:
     mem_reservation: 512m
     command: redis-server --requirepass {{ service_nextcloud_postgres_pass }}
     deploy:
-      resources:
+      limits:
-        limits:
+        cpus: '0.10'
-          cpus: '0.10'
+        memory: 2048M
-          memory: 2048M
 
   nextcloud-db:
     network_mode: "service:nextcloud-gluetun"
@@ -61,10 +53,9 @@ services:
       - POSTGRES_DB=nextcloud
       - POSTGRES_USER=nextcloud
     deploy:
-      resources:
+      limits:
-        limits:
+        cpus: '0.10'
-          cpus: '0.10'
+        memory: 128M
-          memory: 128M
 
   nextcloud:
     network_mode: "service:nextcloud-gluetun"
@@ -73,7 +64,7 @@ services:
       #    links:
       #      - nextcloud-db
     volumes:
-      - /nextcloud-data:/var/www/html
+      - ./nextcloud:/var/www/html
     environment:
       - REDIS_HOST=127.0.0.1
       - REDIS_HOST_PASSWORD={{ service_nextcloud_postgres_pass }}
@@ -87,8 +78,7 @@ services:
       - OVERWRITEPROTOCOL=https
       - OVERWRITECLIURL=https://nextcloud.{{ domain_name }}
     deploy:
-      resources:
+      limits:
-        limits:
+        cpus: '0.25'
-          cpus: '0.25'
+        memory: 512M
-          memory: 512M
 

services/service_nextcloud/proxy_resources/etc/nginx/sites-available/nextcloud.domain

@@ -40,18 +40,6 @@ server {
     		return 301 $scheme://$host/remote.php/dav;
 	}
 
-	location /.well-known/webfinger {
-    		return 301 $scheme://$host/index.php/.well-known/webfinger;
-	}
-
-	location /.well-known/nodeinfo {
-    		return 301 $scheme://$host/index.php/.well-known/nodeinfo;
-	}
-
-	location /ocm-provider {
-    		return 301 $scheme://$host/index.php/ocm-provider;
-	}
-
 }
 
 server {