diff --git a/dashboard/docker-compose.yml b/dashboard/docker-compose.yml index e3996df..77717f5 100644 --- a/dashboard/docker-compose.yml +++ b/dashboard/docker-compose.yml @@ -23,6 +23,8 @@ services: privileged: true environment: - VIRTUAL_HOST=dash.${DOMAIN} + - LETSENCRYPT_HOST=dash.${DOMAIN} + - LETSENCRYPT_EMAIL=${EMAIL} - DASHDOT_ENABLE_CPU_TEMPS=true - DASHDOT_FS_DEVICE_FILTER=sda,sdb,sdc,sdd,sde,sdf - DASHDOT_FS_VIRTUAL_MOUNTS=tank/storage/media, psb29404@psb29404.seedbox.io:/files diff --git a/fusiondance/.gitignore b/fusiondance/.gitignore deleted file mode 100644 index 4846d12..0000000 --- a/fusiondance/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -backup/* -wordpress/* \ No newline at end of file diff --git a/fusiondance/docker-compose.yml b/fusiondance/docker-compose.yml deleted file mode 100644 index b233548..0000000 --- a/fusiondance/docker-compose.yml +++ /dev/null @@ -1,37 +0,0 @@ -services: - db: - image: mysql:8.0 - restart: always - environment: - MYSQL_DATABASE: fusiondance - MYSQL_USER: wordpress - MYSQL_PASSWORD: ${DBPASS} - MYSQL_RANDOM_ROOT_PASSWORD: '1' - volumes: - - db:/var/lib/mysql - wordpress: - depends_on: - - db - image: wordpress - restart: always - environment: - # PUID: ${UID} - # PGID: ${GID} - WORDPRESS_DB_HOST: fusiondance-db-1 - WORDPRESS_DB_USER: wordpress - WORDPRESS_DB_PASSWORD: ${DBPASS} - WORDPRESS_DB_NAME: fusiondance - VIRTUAL_HOST: "www.libertyfusiondance.com, libertyfusiondance.com" - LETSENCRYPT_HOST: "libertyfusiondance.com, www.libertyfusiondance.com" - LETSENCRYPT_EMAIL: ${EMAIL} - # LETSENCRYPT_TEST: true - volumes: - - ./wordpress:/var/www/html - - ./backup:/var/www/html/wp-content/updraft -volumes: - wordpress: - db: -networks: - default: - name: nginx-proxy - external: true diff --git a/ghost-fusiondance/.env.example b/ghost-fusiondance/.env.example new file mode 100644 index 0000000..f160373 --- /dev/null +++ b/ghost-fusiondance/.env.example @@ -0,0 +1,5 @@ +DOMAIN=example.com +DBPASS=password +EMAIL=example@mail.com +DOMAIN=example.com + diff --git a/ghost-fusiondance/.gitignore b/ghost-fusiondance/.gitignore new file mode 100644 index 0000000..0485494 --- /dev/null +++ b/ghost-fusiondance/.gitignore @@ -0,0 +1,3 @@ +db/* +content/* +config.*.json \ No newline at end of file diff --git a/ghost-fusiondance/config.development.json b/ghost-fusiondance/config.development.json new file mode 100644 index 0000000..8462233 --- /dev/null +++ b/ghost-fusiondance/config.development.json @@ -0,0 +1,31 @@ +{ + "url": "http://localhost:2368", + "server": { + "port": 2368, + "host": "::" + }, + "mail": { + "transport": "SMTP", + "options": { + "service": "Mailgun", + "host": "smtp.mailgun.org", + "port": 587, + "secure": false, + "auth": { + "user": "", + "pass": "" + } + } + }, + "logging": { + "transports": [ + "file", + "stdout" + ] + }, + "process": "systemd", + "paths": { + "contentPath": "/var/lib/ghost/content" + } + } + \ No newline at end of file diff --git a/ghost-fusiondance/config.production.json b/ghost-fusiondance/config.production.json new file mode 100644 index 0000000..8b1d4a3 --- /dev/null +++ b/ghost-fusiondance/config.production.json @@ -0,0 +1,30 @@ +{ + "url": "http://localhost:2368", + "server": { + "port": 2368, + "host": "::" + }, + "mail": { + "transport": "SMTP", + "options": { + "service": "Mailgun", + "host": "smtp.mailgun.org", + "port": 587, + "secure": false, + "auth": { + "user": "", + "pass": "" + } + } + }, + "logging": { + "transports": [ + "file", + "stdout" + ] + }, + "process": "systemd", + "paths": { + "contentPath": "/var/lib/ghost/content" + } +} diff --git a/ghost-fusiondance/docker-compose.yml b/ghost-fusiondance/docker-compose.yml new file mode 100644 index 0000000..4270d18 --- /dev/null +++ b/ghost-fusiondance/docker-compose.yml @@ -0,0 +1,41 @@ +services: + + ghost: + image: ghost:5 + restart: always + ports: + - 2368:2368 + expose: + - 2368 + environment: + # see https://ghost.org/docs/config/#configuration-options + database__client: mysql + database__connection__host: ghost-fusiondance-db-1 + database__connection__user: root + database__connection__password: ${DBPASS} + database__connection__database: ghost + VIRTUAL_HOST: "www.${DOMAIN}, ${DOMAIN}" + VIRTUAL_PORT: 2368 + LETSENCRYPT_HOST: "${DOMAIN}, www.${DOMAIN}" + LETSENCRYPT_EMAIL: ${EMAIL} + # url: http://0.0.0.0:2368 #Dev + url: https://libertyfusiondance.com #Prod + # contrary to the default mentioned in the linked documentation, this image defaults to NODE_ENV=production (so development mode needs to be explicitly specified if desired) + # NODE_ENV: development + volumes: + - ./content:/var/lib/ghost/content + # - ./themes:/var/lib/ghost/current/content/themes:rw + db: + image: mysql:8.0 + restart: always + environment: + MYSQL_DATABASE: ghost + MYSQL_ROOT_PASSWORD: ${DBPASS} + volumes: + - db:/var/lib/mysql +volumes: + db: +networks: + default: + name: nginx-proxy + external: true \ No newline at end of file diff --git a/nginx-proxy/docker-compose.yml b/nginx-proxy/docker-compose.yml index 2735643..158d689 100644 --- a/nginx-proxy/docker-compose.yml +++ b/nginx-proxy/docker-compose.yml @@ -3,6 +3,7 @@ services: image: jwilder/nginx-proxy ports: - "80:80" + - "81:81" - "443:443" volumes: - /var/run/docker.sock:/tmp/docker.sock:ro diff --git a/fusiondance/.env.example b/wiki/.env.example similarity index 75% rename from fusiondance/.env.example rename to wiki/.env.example index 7df0b83..88e71e5 100644 --- a/fusiondance/.env.example +++ b/wiki/.env.example @@ -1,3 +1,4 @@ DOMAIN=example.com DBPASS=password EMAIL=example@mail.com +TZ=America/New_York \ No newline at end of file diff --git a/wiki/.gitignore b/wiki/.gitignore new file mode 100644 index 0000000..f537602 --- /dev/null +++ b/wiki/.gitignore @@ -0,0 +1,4 @@ +.env +config/* +db/* + diff --git a/wiki/docker-compose.yml b/wiki/docker-compose.yml new file mode 100644 index 0000000..803466d --- /dev/null +++ b/wiki/docker-compose.yml @@ -0,0 +1,44 @@ +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 \ No newline at end of file