From b9eeffbe42bd757ba805ea11ecb8887f50bda825 Mon Sep 17 00:00:00 2001 From: Brodin Date: Fri, 9 Aug 2024 01:24:54 -0400 Subject: [PATCH] moving and making new sites --- calendar/docker/docker-compose.yaml | 65 ------------------- ghost-fusiondance/config.development.json | 31 --------- ghost-fusiondance/config.production.json | 30 --------- readers/docker-compose.yml | 4 +- {botc => sites/botc}/.env.example | 0 {botc => sites/botc}/.gitignore | 0 {botc => sites/botc}/docker-compose.yml | 0 .../fusiondance}/.env.example | 0 .../fusiondance}/.gitignore | 0 .../fusiondance}/docker-compose.yml | 0 sites/gamesclub/.env.example | 5 ++ sites/gamesclub/.gitignore | 3 + sites/gamesclub/docker-compose.yml | 43 ++++++++++++ sites/photos/.env.example | 5 ++ sites/photos/.gitignore | 3 + sites/photos/docker-compose.yml | 42 ++++++++++++ 16 files changed, 103 insertions(+), 128 deletions(-) delete mode 100644 calendar/docker/docker-compose.yaml delete mode 100644 ghost-fusiondance/config.development.json delete mode 100644 ghost-fusiondance/config.production.json rename {botc => sites/botc}/.env.example (100%) rename {botc => sites/botc}/.gitignore (100%) rename {botc => sites/botc}/docker-compose.yml (100%) rename {ghost-fusiondance => sites/fusiondance}/.env.example (100%) rename {ghost-fusiondance => sites/fusiondance}/.gitignore (100%) rename {ghost-fusiondance => sites/fusiondance}/docker-compose.yml (100%) create mode 100644 sites/gamesclub/.env.example create mode 100644 sites/gamesclub/.gitignore create mode 100644 sites/gamesclub/docker-compose.yml create mode 100644 sites/photos/.env.example create mode 100644 sites/photos/.gitignore create mode 100644 sites/photos/docker-compose.yml diff --git a/calendar/docker/docker-compose.yaml b/calendar/docker/docker-compose.yaml deleted file mode 100644 index 3bc52f3..0000000 --- a/calendar/docker/docker-compose.yaml +++ /dev/null @@ -1,65 +0,0 @@ -# Use postgres/example user/password credentials -version: '3.8' - -volumes: - database-data: -networks: - stack: - name: stack - external: false -services: - database: - container_name: database - image: postgres - restart: always - volumes: - - database-data:/var/lib/postgresql/data/ - env_file: .env - networks: - - stack - calcom: - image: calcom.docker.scarf.sh/calcom/cal.com - build: - context: . - dockerfile: Dockerfile - args: - NEXT_PUBLIC_WEBAPP_URL: ${NEXT_PUBLIC_WEBAPP_URL} - NEXT_PUBLIC_API_V2_URL: ${NEXT_PUBLIC_API_V2_URL} - NEXT_PUBLIC_LICENSE_CONSENT: ${NEXT_PUBLIC_LICENSE_CONSENT} - CALCOM_TELEMETRY_DISABLED: ${CALCOM_TELEMETRY_DISABLED} - NEXTAUTH_SECRET: ${NEXTAUTH_SECRET} - CALENDSO_ENCRYPTION_KEY: ${CALENDSO_ENCRYPTION_KEY} - DATABASE_URL: ${DATABASE_URL} - DATABASE_DIRECT_URL: ${DATABASE_URL} - network: stack - restart: always - networks: - - stack - ports: - - 3000:3000 - env_file: .env - environment: - - DATABASE_URL=postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${DATABASE_HOST}/${POSTGRES_DB} - - DATABASE_DIRECT_URL=${DATABASE_URL} - depends_on: - - database - -# Optional use of Prisma Studio. In production, comment out or remove the section below to prevent unwanted access to your database. - studio: - image: calcom.docker.scarf.sh/calcom/cal.com - restart: always - networks: - - stack - ports: - - 5555:5555 - env_file: .env - environment: - - DATABASE_URL=postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${DATABASE_HOST}/${POSTGRES_DB} - - DATABASE_DIRECT_URL=${DATABASE_URL} - depends_on: - - database - command: - - npx - - prisma - - studio -# END SECTION: Optional use of Prisma Studio. diff --git a/ghost-fusiondance/config.development.json b/ghost-fusiondance/config.development.json deleted file mode 100644 index 8462233..0000000 --- a/ghost-fusiondance/config.development.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "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 deleted file mode 100644 index 8b1d4a3..0000000 --- a/ghost-fusiondance/config.production.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "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/readers/docker-compose.yml b/readers/docker-compose.yml index 20a9a1f..4e7ab06 100644 --- a/readers/docker-compose.yml +++ b/readers/docker-compose.yml @@ -26,9 +26,9 @@ services: - PUID=${UID} - PGID=${GID} - TZ=${TZ} - - VIRTUAL_HOST=ubooquity.${DOMAIN} + - VIRTUAL_HOST=comics.${DOMAIN} - VIRTUAL_PORT=2202 - - LETSENCRYPT_HOST=ubooquity.${DOMAIN} + - LETSENCRYPT_HOST=comics.${DOMAIN} - LETSENCRYPT_EMAIL= ${EMAIL} # - MAXMEM= #optional volumes: diff --git a/botc/.env.example b/sites/botc/.env.example similarity index 100% rename from botc/.env.example rename to sites/botc/.env.example diff --git a/botc/.gitignore b/sites/botc/.gitignore similarity index 100% rename from botc/.gitignore rename to sites/botc/.gitignore diff --git a/botc/docker-compose.yml b/sites/botc/docker-compose.yml similarity index 100% rename from botc/docker-compose.yml rename to sites/botc/docker-compose.yml diff --git a/ghost-fusiondance/.env.example b/sites/fusiondance/.env.example similarity index 100% rename from ghost-fusiondance/.env.example rename to sites/fusiondance/.env.example diff --git a/ghost-fusiondance/.gitignore b/sites/fusiondance/.gitignore similarity index 100% rename from ghost-fusiondance/.gitignore rename to sites/fusiondance/.gitignore diff --git a/ghost-fusiondance/docker-compose.yml b/sites/fusiondance/docker-compose.yml similarity index 100% rename from ghost-fusiondance/docker-compose.yml rename to sites/fusiondance/docker-compose.yml diff --git a/sites/gamesclub/.env.example b/sites/gamesclub/.env.example new file mode 100644 index 0000000..f160373 --- /dev/null +++ b/sites/gamesclub/.env.example @@ -0,0 +1,5 @@ +DOMAIN=example.com +DBPASS=password +EMAIL=example@mail.com +DOMAIN=example.com + diff --git a/sites/gamesclub/.gitignore b/sites/gamesclub/.gitignore new file mode 100644 index 0000000..0485494 --- /dev/null +++ b/sites/gamesclub/.gitignore @@ -0,0 +1,3 @@ +db/* +content/* +config.*.json \ No newline at end of file diff --git a/sites/gamesclub/docker-compose.yml b/sites/gamesclub/docker-compose.yml new file mode 100644 index 0000000..fa60fbb --- /dev/null +++ b/sites/gamesclub/docker-compose.yml @@ -0,0 +1,43 @@ +services: + + ghost: + image: ghost:5 + restart: always + ports: + - 2369:2368 + expose: + - 2369 + environment: + # see https://ghost.org/docs/config/#configuration-options + database__client: mysql + database__connection__host: gamesclub-db-1 + database__connection__user: root + database__connection__password: ${DBPASS} + database__connection__database: ghost + # VIRTUAL_HOST: "www.${DOMAIN}, ${DOMAIN}" + VIRTUAL_HOST: "club.${DOMAIN}" + VIRTUAL_PORT: 2369 + # LETSENCRYPT_HOST: "${DOMAIN}, www.${DOMAIN}" + LETSENCRYPT_HOST: "club.${DOMAIN}" + LETSENCRYPT_EMAIL: ${EMAIL} + # url: http://0.0.0.0:2369 #Dev + url: "https://club.${DOMAIN}" #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/sites/photos/.env.example b/sites/photos/.env.example new file mode 100644 index 0000000..f160373 --- /dev/null +++ b/sites/photos/.env.example @@ -0,0 +1,5 @@ +DOMAIN=example.com +DBPASS=password +EMAIL=example@mail.com +DOMAIN=example.com + diff --git a/sites/photos/.gitignore b/sites/photos/.gitignore new file mode 100644 index 0000000..0485494 --- /dev/null +++ b/sites/photos/.gitignore @@ -0,0 +1,3 @@ +db/* +content/* +config.*.json \ No newline at end of file diff --git a/sites/photos/docker-compose.yml b/sites/photos/docker-compose.yml new file mode 100644 index 0000000..00a07b1 --- /dev/null +++ b/sites/photos/docker-compose.yml @@ -0,0 +1,42 @@ +services: + ghost: + image: ghost:5 + restart: always + ports: + - 2370:2368 + expose: + - 2370 + environment: + # see https://ghost.org/docs/config/#configuration-options + database__client: mysql + database__connection__host: photos-db-1 + database__connection__user: root + database__connection__password: ${DBPASS} + database__connection__database: ghost + # VIRTUAL_HOST: "www.${DOMAIN}, ${DOMAIN}" + VIRTUAL_HOST: "photos.${DOMAIN}" + VIRTUAL_PORT: 2370 + # LETSENCRYPT_HOST: "${DOMAIN}, www.${DOMAIN}" + LETSENCRYPT_HOST: "photos.${DOMAIN}" + LETSENCRYPT_EMAIL: ${EMAIL} + # url: http://0.0.0.0:2370 #Dev + url: "https://photos.${DOMAIN}" #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