From c1d16bdeec7e1893cbf0992bd89002506a4e940b Mon Sep 17 00:00:00 2001
From: Nam Tran <thnam.me@gmail.com>
Date: Tue, 6 Oct 2020 20:00:37 -0500
Subject: [PATCH] add dokuwiki

---
 docker-compose.yml                            | 22 ++++++++++--
 .../nginx/proxy-confs/dokuwiki.subdomain.conf | 36 +++++++++++++++++++
 2 files changed, 55 insertions(+), 3 deletions(-)
 create mode 100644 swag-config/nginx/proxy-confs/dokuwiki.subdomain.conf

diff --git a/docker-compose.yml b/docker-compose.yml
index 3d470f5..3e7ee6a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -23,10 +23,10 @@ services:
       - PUID=1000
       - PGID=1000
       - TZ=America/Chicago
-      - URL=alcap.duckdns.org
+      - URL=gminus2.duckdns.org
       - DUCKDNSTOKEN=7efb0d54-574a-49c5-80d6-214da7c523c6
-      - SUBDOMAINS=
-      - EXTRA_DOMAINS=gminus2.duckdns.org,cloud.gminus2.duckdns.org,git.gminus2.duckdns.org,kb.gminus2.duckdns.org
+      - SUBDOMAINS=cloud,git,kb,wiki
+      - EXTRA_DOMAINS=alcap.duckdns.org
       - VALIDATION=http
       - ONLY_SUBDOMAINS=false
       - STAGING=false
@@ -123,6 +123,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
diff --git a/swag-config/nginx/proxy-confs/dokuwiki.subdomain.conf b/swag-config/nginx/proxy-confs/dokuwiki.subdomain.conf
new file mode 100644
index 0000000..726e1d7
--- /dev/null
+++ b/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;
+
+    }
+}