diff --git a/arr/docker-compose.yml b/arr/docker-compose.yml index d179679..a0f8fb1 100644 --- a/arr/docker-compose.yml +++ b/arr/docker-compose.yml @@ -145,6 +145,7 @@ services: - ${CONFIG_LOCATION}/readarr:/config - ${DATA_LOCATION}/Books:/books - /media/seedbox:/downloads + - ${DATA_LOCATION}/Downloads:/downloads-local expose: - "8787" ports: @@ -164,6 +165,7 @@ services: - ${CONFIG_LOCATION}/readarr-audio:/config - ${DATA_LOCATION}/Audiobooks:/audiobooks - /media/seedbox:/downloads + - ${DATA_LOCATION}/Downloads:/downloads-local restart: unless-stopped networks: default: diff --git a/nginx-proxy/nginx/vhost.d/default b/nginx-proxy/nginx/vhost.d/default index 6753e51..e69de29 100644 --- a/nginx-proxy/nginx/vhost.d/default +++ b/nginx-proxy/nginx/vhost.d/default @@ -1,9 +0,0 @@ -location /tt-rss/ { - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $remote_addr; - proxy_set_header X-Forwarded-Proto $scheme; - - proxy_pass http://127.0.0.1:8280/tt-rss/; - break; -} \ No newline at end of file diff --git a/sites/botc/.env.example b/sites/botc/.env.example index 7df0b83..f160373 100644 --- a/sites/botc/.env.example +++ b/sites/botc/.env.example @@ -1,3 +1,5 @@ DOMAIN=example.com DBPASS=password EMAIL=example@mail.com +DOMAIN=example.com + diff --git a/sites/botc/.gitignore b/sites/botc/.gitignore index 500b7f9..0485494 100644 --- a/sites/botc/.gitignore +++ b/sites/botc/.gitignore @@ -1,4 +1,3 @@ -backup/* -wordpress/* -data/* db/* +content/* +config.*.json \ No newline at end of file diff --git a/sites/botc/docker-compose.yml b/sites/botc/docker-compose.yml index a85a113..28931bd 100644 --- a/sites/botc/docker-compose.yml +++ b/sites/botc/docker-compose.yml @@ -1,34 +1,42 @@ services: + ghost: + image: ghost:5 + restart: always + ports: + - 2371:2368 + expose: + - 2371 + environment: + # see https://ghost.org/docs/config/#configuration-options + database__client: mysql + database__connection__host: botc-db-1 + database__connection__user: root + database__connection__password: ${DBPASS} + database__connection__database: ghost + # VIRTUAL_HOST: "www.${DOMAIN}, ${DOMAIN}" + VIRTUAL_HOST: "www.phillybotc.com, phillybotc.com" + VIRTUAL_PORT: 2371 + # LETSENCRYPT_HOST: "${DOMAIN}, www.${DOMAIN}" + LETSENCRYPT_HOST: "www.phillybotc.com, phillybotc.com" + LETSENCRYPT_EMAIL: ${EMAIL} + # url: http://0.0.0.0:2371 #Dev + url: "https://phillybotc.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: production + volumes: + - ./content:/var/lib/ghost/content + # - ./themes:/var/lib/ghost/current/content/themes:rw db: image: mysql:8.0 restart: always environment: - MYSQL_DATABASE: clocktower - MYSQL_USER: wordpress - MYSQL_PASSWORD: ${DBPASS} - MYSQL_RANDOM_ROOT_PASSWORD: '1' + MYSQL_DATABASE: ghost + MYSQL_ROOT_PASSWORD: ${DBPASS} volumes: - - ./db:/var/lib/mysql:rw - wordpress: - depends_on: - - db - image: wordpress - restart: always - environment: - # PUID: ${UID} - # PGID: ${GID} - WORDPRESS_DB_HOST: botc-db-1 - WORDPRESS_DB_USER: wordpress - WORDPRESS_DB_PASSWORD: ${DBPASS} - WORDPRESS_DB_NAME: clocktower - VIRTUAL_HOST: "www.phillybotc.com, phillybotc.com" - LETSENCRYPT_HOST: "phillybotc.com, www.phillybotc.com" - LETSENCRYPT_EMAIL: ${EMAIL} - # LETSENCRYPT_TEST: true - volumes: - - ./wordpress:/var/www/html:rw - - ./backup:/var/www/html/wp-content/updraft:rw + - ./data:/var/lib/mysql +volumes: + db: networks: default: name: nginx-proxy - external: true + external: true \ No newline at end of file diff --git a/sites/botc/update.sh b/sites/botc/update.sh new file mode 100755 index 0000000..6f9f2ec --- /dev/null +++ b/sites/botc/update.sh @@ -0,0 +1,2 @@ +sudo docker cp config.development.json botc-ghost-1:/var/lib/ghost/. +sudo docker cp config.production.json botc-ghost-1:/var/lib/ghost/. diff --git a/sites/photos/update.sh b/sites/photos/update.sh new file mode 100755 index 0000000..98eb6bf --- /dev/null +++ b/sites/photos/update.sh @@ -0,0 +1,2 @@ +sudo docker cp config.development.json photos-ghost-1:/var/lib/ghost/. +sudo docker cp config.production.json photos-ghost-1:/var/lib/ghost/.