diff --git a/arr/extensions/freshrss-comicsinfeed b/arr/extensions/freshrss-comicsinfeed deleted file mode 160000 index bc46489..0000000 --- a/arr/extensions/freshrss-comicsinfeed +++ /dev/null @@ -1 +0,0 @@ -Subproject commit bc4648940633919d5a8b7d6713a074d2a197b0a3 diff --git a/botc/.gitignore b/botc/.gitignore index 4f8f2b3..4846d12 100644 --- a/botc/.gitignore +++ b/botc/.gitignore @@ -1 +1,2 @@ backup/* +wordpress/* \ No newline at end of file diff --git a/botc/docker-compose.yml b/botc/docker-compose.yml index e9a0581..1660143 100644 --- a/botc/docker-compose.yml +++ b/botc/docker-compose.yml @@ -21,12 +21,12 @@ services: WORDPRESS_DB_USER: wordpress WORDPRESS_DB_PASSWORD: ${DBPASS} WORDPRESS_DB_NAME: clocktower - VIRTUAL_HOST: "botc.${DOMAIN}, *.phillybotc.com, phillybotc.com" - LETSENCRYPT_HOST: "botc.${DOMAIN}, *.phillybotc.com, phillybotc.com" + VIRTUAL_HOST: "www.phillybotc.com, phillybotc.com" + LETSENCRYPT_HOST: "phillybotc.com, www.phillybotc.com" LETSENCRYPT_EMAIL: ${EMAIL} - LETSENCRYPT_TEST: true + # LETSENCRYPT_TEST: true volumes: - - wordpress:/var/www/html + - ./wordpress:/var/www/html - ./backup:/var/www/html/wp-content/updraft volumes: wordpress: diff --git a/games/.env.example b/games/.env.example new file mode 100644 index 0000000..cdadcff --- /dev/null +++ b/games/.env.example @@ -0,0 +1,10 @@ +DOMAIN=example.com +UID=1000 +GID=1000 +TZ=Etc/UTC +CONFIG_LOCATION=./config +DATA_LOCATION=./data +EMAIL=example@mail.com +DBUSER=example +DBPASS=password +RAWG_API_KEY= \ No newline at end of file diff --git a/games/.gitignore b/games/.gitignore new file mode 100644 index 0000000..07f43b8 --- /dev/null +++ b/games/.gitignore @@ -0,0 +1 @@ +data/* \ No newline at end of file diff --git a/games/docker-compose.yml b/games/docker-compose.yml new file mode 100644 index 0000000..7584472 --- /dev/null +++ b/games/docker-compose.yml @@ -0,0 +1,40 @@ +services: + gamevault-backend: + image: phalcode/gamevault-backend:latest + restart: unless-stopped + environment: + - PUID=${UID} + - PGID=${GID} + - DB_HOST=games-db-1 + - DB_USERNAME=${DBUSER} + - DB_PASSWORD=${DBPASS} + - VIRTUAL_HOST=gamevault.${DOMAIN} + - LETSENCRYPT_HOST=gamevault.${DOMAIN} + - LETSENCRYPT_EMAIL=${EMAIL} + # Uncomment and insert your RAWG API Key here if you have one (http://rawg.io/login?forward=developer) + - RAWG_API_KEY=${RAWG_API_KEY} + volumes: + # Mount the folder where your games are + - ${DATA_LOCATION}:/files + # Mount the folder where GameVault should store its images + - ${DATA_LOCATION}/images:/images + expose: + - "8080" + ports: + - 8080:8080 + db: + image: postgres:16 + restart: unless-stopped + environment: + POSTGRES_USER: ${DBUSER} + POSTGRES_PASSWORD: ${DBPASS} + POSTGRES_DB: gamevault + volumes: + # Mount the folder where your PostgreSQL database files should land + - db:/var/lib/postgresql/data +volumes: + db: +networks: + default: + name: nginx-proxy + external: true diff --git a/nextcloud/docker-compose.yml b/nextcloud/docker-compose.yml index fd52d57..91803e7 100644 --- a/nextcloud/docker-compose.yml +++ b/nextcloud/docker-compose.yml @@ -1,38 +1,43 @@ services: redis: + # user: "${UID}:${GID}" image: redis:alpine container_name: redis-dbcache restart: unless-stopped db: image: mysql:latest restart: always - command: --transaction-isolation=READ-COMMITTED --log-bin=binlog --binlog-format=ROW + command: --transaction-isolation=READ-COMMITTED --log-bin=binlog --binlog-format=ROW --log_bin_trust_function_creators=true + # user: ${UID}:${GID} volumes: - db:/var/lib/mysql environment: - - MYSQL_ROOT_PASSWORD=${DBPASS} + - MYSQL_ROOT_PASSWORD=ROOT_ACCESS_PASSWORD - MYSQL_PASSWORD=${DBPASS} - MYSQL_DATABASE=nextcloud - - MYSQL_USER=root + - MYSQL_USER=nextcloud nextcloud: - image: lscr.io/linuxserver/nextcloud:latest + image: nextcloud:29.0.0 container_name: nextcloud + # user: "${UID}:${GID}" + depends_on: + - db + links: + - db environment: - PUID: "1000" - PGID: "1000" TZ: "${TZ}" VIRTUAL_HOST: "nextcloud.${DOMAIN}" MYSQL_HOST: db MYSQL_DATABASE: nextcloud - MYSQL_USER: root + MYSQL_USER: nextcloud MYSQL_PASSWORD: ${DBPASS} REDIS_HOST: redis LETSENCRYPT_HOST: nextcloud.${DOMAIN} LETSENCRYPT_EMAIL: ${EMAIL} - #LETSENCRYPT_TEST: true + # LETSENCRYPT_TEST: true volumes: - - ${CONFIG_LOCATION}/nextcloud:/config - - ${DATA_LOCATION}/Cloud/Nextcloud:/data + - ${CONFIG_LOCATION}:/var/www/html/config:rw + - ${DATA_LOCATION}/Cloud/Nextcloud:/var/www/html/data:rw restart: unless-stopped volumes: db: diff --git a/nginx-proxy/.env.example b/nginx-proxy/.env.example index c8fbe59..492ed35 100644 --- a/nginx-proxy/.env.example +++ b/nginx-proxy/.env.example @@ -1 +1,2 @@ EMAIL=example@mail.com +TZ=America/New_York \ No newline at end of file diff --git a/nginx-proxy/docker-compose.yml b/nginx-proxy/docker-compose.yml index e62446d..2735643 100644 --- a/nginx-proxy/docker-compose.yml +++ b/nginx-proxy/docker-compose.yml @@ -20,6 +20,7 @@ services: - /var/run/docker.sock:/var/run/docker.sock:ro environment: - DEFAULT_EMAIL=${EMAIL} + - TZ=${TZ} networks: default: name: nginx-proxy diff --git a/nginx-proxy/nginx/.gitignore b/nginx-proxy/nginx/.gitignore index df91287..13ccd38 100644 --- a/nginx-proxy/nginx/.gitignore +++ b/nginx-proxy/nginx/.gitignore @@ -1 +1,2 @@ certs/ +html/ \ No newline at end of file