From da3c49c045f3417f4cb6c9c555d4bfccdde64695 Mon Sep 17 00:00:00 2001
From: cspark <work@cspark.dev>
Date: Wed, 6 Nov 2024 04:31:49 +0000
Subject: [PATCH] Nagios config, nextcloud config

---
 proxy_resources/etc/wireguard/wg0.conf        |  4 +--
 serversecrets.example                         |  4 +--
 services/service_nextcloud/docker-compose.yml | 36 ++++++++++---------
 .../nginx/sites-available/nextcloud.domain    | 12 +++++++
 4 files changed, 36 insertions(+), 20 deletions(-)

diff --git a/proxy_resources/etc/wireguard/wg0.conf b/proxy_resources/etc/wireguard/wg0.conf
index c44b2e1..f543daa 100755
--- a/proxy_resources/etc/wireguard/wg0.conf
+++ b/proxy_resources/etc/wireguard/wg0.conf
@@ -56,9 +56,9 @@ AllowedIPs = 10.0.0.8/32
 PersistentKeepalive = 25
 
 
-# Connection to backend server for icinga2
+# Connection to backend server for nagios
 [Peer]
-PublicKey = {{ icinga2_backend_pubkey }}
+PublicKey = {{ nagios_backend_pubkey }}
 AllowedIPs = 10.0.0.198/32
 PersistentKeepalive = 25
 
diff --git a/serversecrets.example b/serversecrets.example
index 67ab67f..30eba77 100755
--- a/serversecrets.example
+++ b/serversecrets.example
@@ -32,7 +32,7 @@ nextcloud_service_privkey: temp
 chat_service_privkey: temp 
 minecraft_service_privkey: temp 
 kimai_service_privkey: temp
-icinga2_backend_privkey: temp
+nagios_backend_privkey: temp
 cockpit_backend_privkey: temp
 user_privkey: temp
 
@@ -45,7 +45,7 @@ nextcloud_service_pubkey: temp
 chat_service_pubkey: temp
 minecraft_service_pubkey: temp
 kimai_service_pubkey: temp
-icinga2_backend_pubkey: temp
+nagios_backend_pubkey: temp
 cockpit_backend_pubkey: temp
 user_pubkey: temp
 
diff --git a/services/service_nextcloud/docker-compose.yml b/services/service_nextcloud/docker-compose.yml
index 5d7bcb6..95e93e4 100755
--- a/services/service_nextcloud/docker-compose.yml
+++ b/services/service_nextcloud/docker-compose.yml
@@ -21,13 +21,14 @@ 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
-      - ./post-rules.txt:/iptables/post-rules.txt
-    ports:
-      - "11000:11000"
+       - ./post-rules.txt:/iptables/post-rules.txt
+      #ports:
+      #  - "80:11000"
     deploy:
-      limits:
-        cpus: '0.10'
-        memory: 512M
+      resources:
+        limits:
+          cpus: '0.10'
+          memory: 512M
 
   nextcloud-cache:
     network_mode: "service:nextcloud-gluetun"
@@ -37,9 +38,10 @@ services:
     mem_reservation: 512m
     command: redis-server --requirepass {{ service_nextcloud_postgres_pass }}
     deploy:
-      limits:
-        cpus: '0.10'
-        memory: 2048M
+      resources:
+        limits:
+          cpus: '0.10'
+          memory: 2048M
 
   nextcloud-db:
     network_mode: "service:nextcloud-gluetun"
@@ -53,9 +55,10 @@ services:
       - POSTGRES_DB=nextcloud
       - POSTGRES_USER=nextcloud
     deploy:
-      limits:
-        cpus: '0.10'
-        memory: 128M
+      resources:
+        limits:
+          cpus: '0.10'
+          memory: 128M
 
   nextcloud:
     network_mode: "service:nextcloud-gluetun"
@@ -64,7 +67,7 @@ services:
       #    links:
       #      - nextcloud-db
     volumes:
-      - ./nextcloud:/var/www/html
+      - /nextcloud-data:/var/www/html
     environment:
       - REDIS_HOST=127.0.0.1
       - REDIS_HOST_PASSWORD={{ service_nextcloud_postgres_pass }}
@@ -78,7 +81,8 @@ services:
       - OVERWRITEPROTOCOL=https
       - OVERWRITECLIURL=https://nextcloud.{{ domain_name }}
     deploy:
-      limits:
-        cpus: '0.25'
-        memory: 512M
+      resources:
+        limits:
+          cpus: '0.25'
+          memory: 512M
 
diff --git a/services/service_nextcloud/proxy_resources/etc/nginx/sites-available/nextcloud.domain b/services/service_nextcloud/proxy_resources/etc/nginx/sites-available/nextcloud.domain
index 4747726..ea2ea1e 100755
--- a/services/service_nextcloud/proxy_resources/etc/nginx/sites-available/nextcloud.domain
+++ b/services/service_nextcloud/proxy_resources/etc/nginx/sites-available/nextcloud.domain
@@ -40,6 +40,18 @@ 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 {