Compare commits

..

No commits in common. "a5fe3f0adfc11c54b0da7975143a0da458a0621c" and "a65f60e16c47a08a888d658dea7e1d893bbabdc5" have entirely different histories.

6 changed files with 6 additions and 58 deletions

View File

@ -23,8 +23,6 @@ services:
privileged: true privileged: true
environment: environment:
- VIRTUAL_HOST=dash.${DOMAIN} - VIRTUAL_HOST=dash.${DOMAIN}
- LETSENCRYPT_HOST=dash.${DOMAIN}
- LETSENCRYPT_EMAIL=${EMAIL}
- DASHDOT_ENABLE_CPU_TEMPS=true - DASHDOT_ENABLE_CPU_TEMPS=true
- DASHDOT_FS_DEVICE_FILTER=sda,sdb,sdc,sdd,sde,sdf - DASHDOT_FS_DEVICE_FILTER=sda,sdb,sdc,sdd,sde,sdf
- DASHDOT_FS_VIRTUAL_MOUNTS=tank/storage/media, psb29404@psb29404.seedbox.io:/files - DASHDOT_FS_VIRTUAL_MOUNTS=tank/storage/media, psb29404@psb29404.seedbox.io:/files

View File

@ -1,3 +1,2 @@
db/*
backup/* backup/*
wordpress/* wordpress/*

View File

@ -8,7 +8,7 @@ services:
MYSQL_PASSWORD: ${DBPASS} MYSQL_PASSWORD: ${DBPASS}
MYSQL_RANDOM_ROOT_PASSWORD: '1' MYSQL_RANDOM_ROOT_PASSWORD: '1'
volumes: volumes:
- ./db:/var/lib/mysql - db:/var/lib/mysql
wordpress: wordpress:
depends_on: depends_on:
- db - db
@ -22,12 +22,15 @@ services:
WORDPRESS_DB_PASSWORD: ${DBPASS} WORDPRESS_DB_PASSWORD: ${DBPASS}
WORDPRESS_DB_NAME: fusiondance WORDPRESS_DB_NAME: fusiondance
VIRTUAL_HOST: "www.libertyfusiondance.com, libertyfusiondance.com" VIRTUAL_HOST: "www.libertyfusiondance.com, libertyfusiondance.com"
LETSENCRYPT_HOST: "libertyfusiondance.com" LETSENCRYPT_HOST: "libertyfusiondance.com, www.libertyfusiondance.com"
LETSENCRYPT_EMAIL: ${EMAIL} LETSENCRYPT_EMAIL: ${EMAIL}
# LETSENCRYPT_TEST: true # LETSENCRYPT_TEST: true
volumes: volumes:
- ./wordpress:/var/www/html - ./wordpress:/var/www/html
- ./backup:/var/www/html/wp-content/updraft - ./backup:/var/www/html/wp-content/updraft
volumes:
wordpress:
db:
networks: networks:
default: default:
name: nginx-proxy name: nginx-proxy

View File

@ -1,4 +0,0 @@
DOMAIN=example.com
DBPASS=password
EMAIL=example@mail.com
TZ=America/New_York

4
wiki/.gitignore vendored
View File

@ -1,4 +0,0 @@
.env
config/*
db/*

View File

@ -1,44 +0,0 @@
services:
bookstack:
image: lscr.io/linuxserver/bookstack
container_name: bookstack
environment:
- PUID=1000
- PGID=1000
- TZ=${TZ}
- APP_URL=https://wiki.${DOMAIN}
- DB_HOST=bookstack_db
- DB_PORT=3306
- DB_USER=bookstack
- DB_PASS=${DBPASS}
- DB_DATABASE=bookstackapp
- VIRTUAL_HOST=wiki.${DOMAIN}
- LETSENCRYPT_HOST=wiki.${DOMAIN}
- LETSENCRYPT_EMAIL=${EMAIL}
volumes:
- ./config:/config
ports:
- 6875:80
expose:
- "6875"
restart: unless-stopped
depends_on:
- bookstack_db
bookstack_db:
image: lscr.io/linuxserver/mariadb
container_name: bookstack_db
environment:
- PUID=1000
- PGID=1000
- TZ=${TZ}
- MYSQL_ROOT_PASSWORD=${DBPASS}
- MYSQL_DATABASE=bookstackapp
- MYSQL_USER=bookstack
- MYSQL_PASSWORD=${DBPASS}
volumes:
- ./db:/config
restart: unless-stopped
networks:
default:
name: nginx-proxy
external: true