add restart for cocalc

docker-compose.yml

@@ -13,6 +13,7 @@ services:
     #   - 0.0.0.0:8752:443
     networks:
       - shnet
+    restart: unless-stopped
 
   swag:
     image: linuxserver/swag
@@ -23,10 +24,10 @@ services:
       - PUID=1000
       - PGID=1000
       - TZ=America/Chicago
-      - URL=alcap.duckdns.org
+      - URL=gminus2.duckdns.org
       - DUCKDNSTOKEN=7efb0d54-574a-49c5-80d6-214da7c523c6
-      - SUBDOMAINS=
+      - SUBDOMAINS=cloud,git,kb,wiki
-      - EXTRA_DOMAINS=gminus2.duckdns.org,cloud.gminus2.duckdns.org,git.gminus2.duckdns.org,kb.gminus2.duckdns.org
+      - EXTRA_DOMAINS=alcap.duckdns.org
       - VALIDATION=http
       - ONLY_SUBDOMAINS=false
       - STAGING=false
@@ -96,6 +97,7 @@ services:
       - DB_DATABASE=bookstack
     volumes:
       - ./bookstack-data:/config
+      - /home/nam/Data/notes/bookstack/public/favicon.ico:/var/www/html/public/favicon.ico
     # ports:
     #   - 6875:80
     restart: unless-stopped
@@ -105,14 +107,14 @@ services:
       - shnet
   
   cloud:
-    image: linuxserver/nextcloud
+    image: linuxserver/nextcloud:20.0.0-ls102
     container_name: cloud
     environment:
       - PUID=1000
       - PGID=1000
       - TZ=America/Chicago
     # ports:
-    #   - 4443:443
+    #   - 192.168.1.107:4443:443
     restart: unless-stopped
     volumes:
       - /home/nam/Data/CloudData:/data
@@ -122,6 +124,22 @@ services:
     networks:
       - shnet
   
+  dokuwiki:
+    image: linuxserver/dokuwiki
+    container_name: dokuwiki
+    environment:
+      - PUID=1000
+      - PGID=1000
+      - TZ=America/Chicago
+    volumes:
+      - ./dokuwiki-data:/config
+    ports:
+      - 192.168.1.107:6880:80
+      - 192.168.1.107:6443:443 #optional
+    restart: unless-stopped
+    networks: 
+      - shnet
+
   # pma:
   #   image: phpmyadmin/phpmyadmin:latest
   #   container_name: pma
@@ -130,6 +148,6 @@ services:
   #     - PMA_USER=root
   #     - PMA_PASSWORD=a141592-Z
   #   ports:
-  #     - 0.0.0.0:8081:80
+  #     - 192.168.1.107:8081:80
   #   networks: 
-  #     - shnet
+  #     - shnet

swag-config/nginx/proxy-confs/dokuwiki.subdomain.conf

@@ -0,0 +1,36 @@
+# First complete the setup by appending install.php to URL.
+# Make sure that your dns has a cname set for dokuwiki
+server {
+    listen 80;
+    listen [::]:80;
+    server_name wiki.gminus2.duckdns.org;
+
+    location / {
+        return 301 https://$server_name$request_uri;
+    }
+
+}
+
+server {
+    listen 443 ssl;
+    listen [::]:443 ssl;
+
+    server_name wiki.gminus2.duckdns.org;
+
+    include /config/nginx/ssl.conf;
+
+    client_max_body_size 0;
+
+    location / {
+        #enable the next two lines for http auth
+        #auth_basic "Restricted";
+        #auth_basic_user_file /config/nginx/.htpasswd;
+
+        include /config/nginx/proxy.conf;
+        set $upstream_app dokuwiki;
+        set $upstream_port 80;
+        set $upstream_proto http;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
+    }
+}