diff --git a/.gitignore b/.gitignore index 363304d..6f396ba 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ .email .db-password .db-root-password +.env diff --git a/config.production.template b/config.production.template index a4b3686..fc1f089 100644 --- a/config.production.template +++ b/config.production.template @@ -23,5 +23,13 @@ "password": "$DBPASSWORD", "database": "ghostdb" } + }, +"spam": { + "user_login": { + "freeRetries": 1000 + }, + "member_login": { + "freeRetries": 1000 + } } } diff --git a/deploy.sh b/deploy.sh index 4c7cf17..1868e13 100644 --- a/deploy.sh +++ b/deploy.sh @@ -1,3 +1,5 @@ docker stack rm rose-ash - -for i in 1 2 3 4 5 6 7 8 9 10; do sleep 5 && docker stack deploy -c docker-compose.yml rose-ash && break ; done +. ./.env +echo $CERTBOT_EMAIL +echo $DOMAIN +for i in 1 2 3 4 5 6 7 8 9 10; do sleep 5 && docker stack deploy -c docker-compose.yml rose-ash && break ; done diff --git a/docker-compose.yml b/docker-compose.yml index 11de1b3..11c2822 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,10 +2,8 @@ version: "3.3" services: ghost: image: rose-ash-ghost:latest - depends_on: - - db environment: - url: https://sigyl.com:4000/ + url: https://roseash.info/ NODE_ENV: production volumes: - ghost-content:/var/lib/ghost/content @@ -17,25 +15,23 @@ services: - db-password db: - image: mariadb:latest + image: mysql:latest environment: - FILE__MYSQL_ROOT_PASSWORD: /run/secrets/db-root-password + MYSQL_ROOT_PASSWORD: mysqlrootpass MYSQL_USER: ghost - FILE__MYSQL_PASSWORD: /run/secrets/db-password + MYSQL_PASSWORD: ghostdbpass MYSQL_DATABASE: ghostdb volumes: - - ghost-db:/var/lib/mysql + - ghost-mysql-db:/var/lib/mysql networks: - appnet secrets: - db-password - db-root-password - volumes: ghost-content: ghost-config: - ghost-db: - + ghost-mysql-db: networks: appnet: driver: overlay @@ -49,3 +45,4 @@ secrets: file: ./.db-password db-root-password: file: ./.db-root-password +