Compare commits

...

2 Commits

Author SHA1 Message Date
c1d16bdeec add dokuwiki 2020-10-06 20:00:37 -05:00
6e5bf0745e specify favicon for bookstsack 2020-10-05 18:50:45 -05:00
2 changed files with 56 additions and 3 deletions

View File

@@ -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
@@ -96,6 +96,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
@@ -122,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

View File

@@ -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;
}
}