Merge branch 'main' of https://sigyl.com/git/village-hall/web-site into main

config.production.template

@@ -23,5 +23,13 @@
       "password": "$DBPASSWORD",
       "database": "ghostdb"
     }
+  },
+"spam": {
+    "user_login": {
+        "freeRetries": 1000
+    },
+     "member_login": {
+        "freeRetries": 1000
+    }
   }
 }

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

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
+