Trying to commit more often during Hurricane Ian.

deployment/www/backup_path.sh

@@ -22,7 +22,15 @@ REMOTE_BACKUP_LOCATION="$REMOTE_BACKUP_PATH/$1/$DOMAIN_NAME"
 
 # step 1: run duplicity on the remote system to backup all files to the remote system.
 # --allow-source-mismatch
-ssh "$PRIMARY_WWW_FQDN" sudo PASSPHRASE="$DUPLICITY_BACKUP_PASSPHRASE" duplicity "$REMOTE_HOME/$1/$DOMAIN_NAME" "file://$REMOTE_BACKUP_LOCATION"
+REMOTE_SOURCE_BACKUP_PATH="$REMOTE_HOME/$1/$DOMAIN_NAME"
+
+# if the source files to backup don't exist on the remote host, we return.
+if ! ssh "$PRIMARY_WWW_FQDN" "[ -d $REMOTE_SOURCE_BACKUP_PATH"; then
+    echo "INFO: The path to backup does not exist. There's nothing to backup! That's ok, execution will continue."
+    exit 0
+fi
+
+ssh "$PRIMARY_WWW_FQDN" sudo PASSPHRASE="$DUPLICITY_BACKUP_PASSPHRASE" duplicity "$REMOTE_SOURCE_BACKUP_PATH" "file://$REMOTE_BACKUP_LOCATION"
 ssh "$PRIMARY_WWW_FQDN" sudo chown -R ubuntu:ubuntu "$REMOTE_BACKUP_LOCATION"
 
 

deployment/www/go.sh

@@ -91,9 +91,6 @@ for DOMAIN_NAME in ${DOMAIN_LIST//,/ }; do
         ssh "$PRIMARY_WWW_FQDN" "mkdir -p $REMOTE_NEXTCLOUD_PATH/html"
     fi
 
-    if [ "$DEPLOY_GITEA" = true ]; then
-        ssh "$FQDN" "mkdir -p $REMOTE_GITEA_PATH/data $REMOTE_GITEA_PATH/db"
-    fi
 
 done
 
@@ -133,6 +130,8 @@ fi
 
 bash -c ./stub/nginx_yml.sh
 bash -c ./stub/ghost_yml.sh
+bash -c ./stub/gitea_yml.sh
+
 
 # # start a browser session; point it to port 80 to ensure HTTPS redirect.
 # wait-for-it -t 320 "$PRIMARY_WWW_FQDN:80"

deployment/www/stop_docker_stacks.sh

@@ -14,20 +14,19 @@ for DOMAIN_NAME in ${DOMAIN_LIST//,/ }; do
     source ../../domain_env.sh
 
     ### Stop all services.
-    for APP in ghost; do
+    for APP in ghost gitea; do
+        # backup each language for each app.
         for LANGUAGE_CODE in ${SITE_LANGUAGE_CODES//,/ }; do
-            STACK_NAME="$DOCKER_STACK_SUFFIX-$LANGUAGE_CODE"
+            STACK_NAME="$DOCKER_STACK_SUFFIX-$APP-$LANGUAGE_CODE"
+
             if docker stack list --format "{{.Name}}" | grep -q "$STACK_NAME"; then
                 docker stack rm "$STACK_NAME"
                 sleep 2
             fi
 
-            if [ "$BACKUP_GHOST"  = true ]; then
-                ./backup_path.sh "$APP"
-            fi
+            ./backup_path.sh "$APP"
         done
     done
-
 done
 
 

deployment/www/stub/ghost_yml.sh

@@ -1,20 +1,21 @@
 #!/bin/bash
 
+set -exu
+cd "$(dirname "$0")"
 
-domain_number=0
 for DOMAIN_NAME in ${DOMAIN_LIST//,/ }; do
     export DOMAIN_NAME="$DOMAIN_NAME"
     export SITE_PATH="$SITES_PATH/$DOMAIN_NAME"
 
-
     # source the site path so we know what features it has.
-    source ../../reset_env.sh
+    source ../../../reset_env.sh
     source "$SITE_PATH/site_definition"
-    source ../../domain_env.sh
+    source ../../../domain_env.sh
 
     # for each language specified in the site_definition, we spawn a separate ghost container
     # at https://www.domain.com/$LANGUAGE_CODE
     for LANGUAGE_CODE in ${SITE_LANGUAGE_CODES//,/ }; do
+
         STACK_NAME="$DOCKER_STACK_SUFFIX-$LANGUAGE_CODE"
 
         # ensure directories on remote host exist so we can mount them into the containers.
@@ -81,22 +82,23 @@ EOL
 networks:
 EOL
 
-        if [ "$DEPLOY_GHOST" = true ]; then
-            GHOSTNET_NAME="ghostnet-$DOCKER_STACK_SUFFIX-$LANGUAGE_CODE"
-            GHOSTDBNET_NAME="ghostdbnet-$DOCKER_STACK_SUFFIX-$LANGUAGE_CODE"
+            if [ "$DEPLOY_GHOST" = true ]; then
+                GHOSTNET_NAME="ghostnet-$DOCKER_STACK_SUFFIX-$LANGUAGE_CODE"
+                GHOSTDBNET_NAME="ghostdbnet-$DOCKER_STACK_SUFFIX-$LANGUAGE_CODE"
 
-            cat >>"$DOCKER_YAML_PATH" <<EOL
+                cat >>"$DOCKER_YAML_PATH" <<EOL
     ${GHOSTNET_NAME}:
       name: "reverse-proxy_ghostnet-$DOCKER_STACK_SUFFIX-$LANGUAGE_CODE"
       external: true
 
     ${GHOSTDBNET_NAME}:
 EOL
-        fi
+            fi
 
-        docker stack deploy -c "$DOCKER_YAML_PATH" "$DOCKER_STACK_SUFFIX-$LANGUAGE_CODE"
-        sleep 1
-    done
-    
-    domain_number=$((domain_number+1))
-done
+        docker stack deploy -c "$DOCKER_YAML_PATH" "$DOCKER_STACK_SUFFIX-ghost-$LANGUAGE_CODE"
+
+        sleep 2
+
+    done # language code
+
+done # domain list

deployment/www/stub/gitea_yml.sh

@@ -0,0 +1,92 @@
+#!/bin/bash
+
+set -exu
+cd "$(dirname "$0")"
+
+for DOMAIN_NAME in ${DOMAIN_LIST//,/ }; do
+    export DOMAIN_NAME="$DOMAIN_NAME"
+    export SITE_PATH="$SITES_PATH/$DOMAIN_NAME"
+
+    # source the site path so we know what features it has.
+    source ../../../reset_env.sh
+    source "$SITE_PATH/site_definition"
+    source ../../../domain_env.sh
+
+    if [ "$DEPLOY_GITEA" = true ]; then
+        GITEA_PATH="$REMOTE_GITEA_PATH/$DOMAIN_NAME/${LANGUAGE_CODE}"
+
+        ssh "$PRIMARY_WWW_FQDN" mkdir -p "$GITEA_PATH"
+
+        STACK_NAME="$DOCKER_STACK_SUFFIX-$LANGUAGE_CODE"
+
+        export STACK_TAG="gitea-$STACK_NAME"
+        export DB_STACK_TAG="giteadb-$STACK_NAME"
+
+        # todo append domain number or port number.
+        WEBSTACK_PATH="$SITE_PATH/webstack"
+        mkdir -p "$WEBSTACK_PATH" "$WEBSTACK_PATH/data" "$WEBSTACK_PATH/db"
+        export DOCKER_YAML_PATH="$WEBSTACK_PATH/gitea-en.yml"
+
+        NET_NAME="giteanet-$DOCKER_STACK_SUFFIX"
+        DBNET_NAME="giteadbnet-$DOCKER_STACK_SUFFIX"
+
+        # here's the NGINX config. We support ghost and nextcloud.
+        echo "" > "$DOCKER_YAML_PATH"
+        cat >>"$DOCKER_YAML_PATH" <<EOL
+version: "3.8"
+services:
+
+  ${STACK_TAG}:
+    image: ${GITEA_IMAGE}
+    volumes:
+      - ${GITEA_PATH}/data:/data
+      - /etc/timezone:/etc/timezone:ro
+      - /etc/localtime:/etc/localtime:ro
+    environment:
+      - USER_UID=1000
+      - USER_GID=1000
+      - ROOT_URL=https://${GITEA_FQDN}
+      - GITEA__database__DB_TYPE=mysql
+      - GITEA__database__HOST=${DB_STACK_TAG}:3306
+      - GITEA__database__NAME=gitea
+      - GITEA__database__USER=gitea
+      - GITEA__PASSWD=\${GITEA_MYSQL_PASSWORD}
+    networks:
+      - ${NET_NAME}
+      - ${DBNET_NAME}
+    deploy:
+      restart_policy:
+        condition: on-failure
+
+  ${DB_STACK_TAG}:
+    image: ${GITEA_DB_IMAGE}
+    networks:
+      - ${DBNET_NAME}
+    volumes:
+      - ${GITEA_PATH}/db:/var/lib/mysql
+    environment:
+      - MYSQL_ROOT_PASSWORD=\${GITEA_MYSQL_ROOT_PASSWORD}
+      - MYSQL_PASSWORD=\${GITEA_MYSQL_PASSWORD}
+      - MYSQL_DATABASE=gitea
+      - MYSQL_USER=gitea
+    deploy:
+      restart_policy:
+        condition: on-failure
+
+networks:
+EOL
+
+        cat >>"$DOCKER_YAML_PATH" <<EOL
+    ${NET_NAME}:
+      name: "reverse-proxy_${NET_NAME}-${LANGUAGE_CODE}"
+      external: true
+
+    ${DBNET_NAME}:
+EOL
+
+        docker stack deploy -c "$DOCKER_YAML_PATH" "$DOCKER_STACK_SUFFIX-gitea-$LANGUAGE_CODE"
+        sleep 1
+    
+    fi
+
+done

deployment/www/stub/gittea_yml.sh

@@ -1,27 +0,0 @@
-
-
-
-
-    if [ "$DEPLOY_GITEA" = true ]; then
-        cat >>"$NGINX_CONF_PATH" <<EOL
-    # TLS listener for ${GITEA_FQDN}
-    server {
-        listen 443 ssl http2;
-        listen [::]:443 ssl http2;
-    
-        server_name ${GITEA_FQDN};
-        
-        location / {
-            proxy_headers_hash_max_size 512;
-            proxy_headers_hash_bucket_size 64;
-            proxy_set_header X-Real-IP \$remote_addr;
-            proxy_set_header Host \$host;
-            proxy_set_header X-Forwarded-For \$proxy_add_x_forwarded_for;
-            proxy_set_header X-Forwarded-Proto \$scheme;
-            proxy_set_header X-NginX-Proxy true;
-            
-            proxy_pass http://gitea:3000;
-        }
-    }
-EOL
-    fi

deployment/www/stub/nginx_config.sh

@@ -222,7 +222,6 @@ EOL
 
     # SERVER block for BTCPAY Server
     if [ "$VPS_HOSTING_TARGET" = lxd ]; then
-        # gitea http to https redirect.
         if [ "$DEPLOY_BTCPAY_SERVER" = true ]; then
         
             cat >>"$NGINX_CONF_PATH" <<EOL
@@ -361,6 +360,36 @@ EOL
             proxy_cache_use_stale error timeout invalid_header updating http_500 http_502 http_503 http_504;
         }
 
+EOL
+
+    # this is the closing server block for the ghost HTTPS segment
+    cat >>"$NGINX_CONF_PATH" <<EOL
+    
+    }
+
+EOL
+        # this piece is for GITEA.
+        cat >>"$NGINX_CONF_PATH" <<EOL
+    # TLS listener for ${GITEA_FQDN}
+    server {
+        listen 443 ssl http2;
+        listen [::]:443 ssl http2;
+    
+        server_name ${GITEA_FQDN};
+        
+        location / {
+            proxy_headers_hash_max_size 512;
+            proxy_headers_hash_bucket_size 64;
+            proxy_set_header X-Real-IP \$remote_addr;
+            proxy_set_header Host \$host;
+            proxy_set_header X-Forwarded-For \$proxy_add_x_forwarded_for;
+            proxy_set_header X-Forwarded-Proto \$scheme;
+            proxy_set_header X-NginX-Proxy true;
+            
+            proxy_pass http://gitea:3000;
+        }
+    }
+
 EOL
 
     done
@@ -376,12 +405,6 @@ EOL
         #     proxy_pass http://ghost-${DOCKER_STACK_SUFFIX}-${SITE_LANGUAGE_CODES}::2368\$og_prefix\$request_uri;
         # }
 
-    # this is the closing server block for the ghost HTTPS segment
-    cat >>"$NGINX_CONF_PATH" <<EOL
-    
-    }
-
-EOL
 
     iteration=$((iteration+1))
 done

deployment/www/stub/nginx_yml.sh

@@ -38,6 +38,12 @@ EOL
         done
     done
 
+        if [ "$DEPLOY_GITEA" = true ]; then
+            cat >> "$DOCKER_YAML_PATH" <<EOL
+        - giteanet-$DOCKER_STACK_SUFFIX-$LANGUAGE_CODE
+EOL
+        fi
+
         cat >> "$DOCKER_YAML_PATH" <<EOL
     volumes:
       - ${REMOTE_HOME}/letsencrypt:/etc/letsencrypt:ro
@@ -82,6 +88,16 @@ EOL
 EOL
 
         done
+
+
+        if [ "$DEPLOY_GITEA" = true ]; then
+            cat >> "$DOCKER_YAML_PATH" <<EOL
+  giteanet-$DOCKER_STACK_SUFFIX-$LANGUAGE_CODE:
+    attachable: true
+
+EOL
+        fi
+
     done
 
 docker stack deploy -c "$DOCKER_YAML_PATH" "reverse-proxy"

deployment/www/stub_docker_yml.sh

@@ -47,47 +47,6 @@
 # EOL
 #     fi
 
-#     if [ "$DEPLOY_GITEA" = true ]; then
-#         cat >>"$DOCKER_YAML_PATH" <<EOL
-#   gitea:
-#     image: ${GITEA_IMAGE}
-#     volumes:
-#       - ${REMOTE_GITEA_PATH}/data:/data
-#       - /etc/timezone:/etc/timezone:ro
-#       - /etc/localtime:/etc/localtime:ro
-#     environment:
-#       - USER_UID=1000
-#       - USER_GID=1000
-#       - ROOT_URL=https://${GITEA_FQDN}
-#       - GITEA__database__DB_TYPE=mysql
-#       - GITEA__database__HOST=gitea-db:3306
-#       - GITEA__database__NAME=gitea
-#       - GITEA__database__USER=gitea
-#       - GITEA__PASSWD=\${GITEA_MYSQL_PASSWORD}
-#     networks:
-#       - gitea-net
-#       - giteadb-net
-#     deploy:
-#       restart_policy:
-#         condition: on-failure
-
-#   gitea-db:
-#     image: ${GITEA_DB_IMAGE}
-#     networks:
-#       - giteadb-net
-#     volumes:
-#       - ${REMOTE_GITEA_PATH}/db:/var/lib/mysql
-#     environment:
-#       - MYSQL_ROOT_PASSWORD=\${GITEA_MYSQL_ROOT_PASSWORD}
-#       - MYSQL_PASSWORD=\${GITEA_MYSQL_PASSWORD}
-#       - MYSQL_DATABASE=gitea
-#       - MYSQL_USER=gitea
-#     deploy:
-#       restart_policy:
-#         condition: on-failure
-# EOL
-#     fi
-
 
 
 #     if [ "$DEPLOY_ONION_SITE" = true ]; then
@@ -144,11 +103,6 @@
 # EOL
 #     fi
 
-#     if [ "$DEPLOY_GITEA" = true ]; then
-# cat >>"$DOCKER_YAML_PATH" <<EOL
-#       - gitea-net
-# EOL
-#     fi
 
 #     if [ "$DEPLOY_ONION_SITE" = true ]; then
 # cat >>"$DOCKER_YAML_PATH" <<EOL
@@ -176,12 +130,6 @@
 # EOL
 #     fi
 
-#     if [ "$DEPLOY_GITEA" = true ]; then
-#         cat >>"$DOCKER_YAML_PATH" <<EOL
-#   gitea-net:
-#   giteadb-net:
-# EOL
-#     fi
 
 #     if [ "$DEPLOY_ONION_SITE" = true ]; then
 #         cat >>"$DOCKER_YAML_PATH" <<EOL

domain_env.sh

@@ -23,4 +23,4 @@ UNIX_BACKUP_TIMESTAMP="$(date +%s)"
 
 export BACKUP_TIMESTAMP="$BACKUP_TIMESTAMP"
 export UNIX_BACKUP_TIMESTAMP="$UNIX_BACKUP_TIMESTAMP"
-export DOCKER_STACK_SUFFIX="${DOMAIN_NAME//./-}"
+export DOCKER_STACK_SUFFIX="${DOMAIN_NAME//./-}"

reset_env.sh

@@ -18,7 +18,7 @@ export NEXTCLOUD_MYSQL_ROOT_PASSWORD=
 export GITEA_MYSQL_PASSWORD=
 export GITEA_MYSQL_ROOT_PASSWORD=
 export SITE_LANGUAGE_CODES="en"
-export LANGUAGE_CODE=
+export LANGUAGE_CODE="en"
 
 SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
 source "$SCRIPT_DIR/defaults.sh"