Bump nginx version and other updates.

defaults.sh

@@ -74,7 +74,7 @@ export GHOST_IMAGE="ghost:5.20.0"
 export GHOST_DB_IMAGE="$DEFAULT_DB_IMAGE"
 
 
-export NGINX_IMAGE="nginx:1.23.1"
+export NGINX_IMAGE="nginx:1.23.2"
 
 # version of backup is 24.0.3
 export NEXTCLOUD_IMAGE="nextcloud:25.0.0"

deploy.sh

@@ -25,7 +25,7 @@ if ! lsb_release -d | grep -q "Ubuntu 22.04"; then
 fi
 
 DOMAIN_NAME=
-RUN_CERT_RENEWAL=true
+RUN_CERT_RENEWAL=false
 SKIP_WWW=false
 RESTORE_WWW=false
 BACKUP_CERTS=false
@@ -348,7 +348,7 @@ fi
 PROJECT_DEFINITION_PATH="$PROJECT_PATH/project_definition"
 if [ ! -f "$PROJECT_DEFINITION_PATH" ]; then
 
-    # stub out a site_definition with new passwords.
+    # stub out a project_definition
     cat >"$PROJECT_DEFINITION_PATH" <<EOL
 #!/bin/bash
 

deployment/www/stub/nginx_yml.sh

@@ -49,7 +49,7 @@ EOL
 
                 if [ "$DEPLOY_NOSTR_RELAY" = "true" ]; then
                     cat >> "$DOCKER_YAML_PATH" <<EOL
-        - nostrnet-$DOMAIN_IDENTIFIER
+        - nostrnet-$DOMAIN_IDENTIFIER-en
 EOL
                 fi
             fi
@@ -84,7 +84,12 @@ EOL
 
 
     for DOMAIN_NAME in ${DOMAIN_LIST//,/ }; do
-        export DOMAIN_NAME="$DOMAIN_NAME"
+                export DOMAIN_NAME="$DOMAIN_NAME"
+        export SITE_PATH="$SITES_PATH/$DOMAIN_NAME"
+
+        # source the site path so we know what features it has.
+        source "$RESPOSITORY_PATH/reset_env.sh"
+        source "$SITE_PATH/site_definition"
         source "$RESPOSITORY_PATH/domain_env.sh"
 
         # for each language specified in the site_definition, we spawn a separate ghost container
@@ -96,34 +101,32 @@ EOL
 
 EOL
 
-        done
-
-
-        if [ "$DEPLOY_GITEA" = true ]; then
-            cat >> "$DOCKER_YAML_PATH" <<EOL
+            if [ "$LANGUAGE_CODE" = en ]; then
+                if [ "$DEPLOY_GITEA" = true ]; then
+                    cat >> "$DOCKER_YAML_PATH" <<EOL
   giteanet-$DOMAIN_IDENTIFIER-en:
     attachable: true
 
 EOL
-        fi
+                fi
 
-        if [ "$DEPLOY_NEXTCLOUD" = "true" ]; then
-            cat >> "$DOCKER_YAML_PATH" <<EOL
+                if [ "$DEPLOY_NEXTCLOUD" = true ]; then
+                    cat >> "$DOCKER_YAML_PATH" <<EOL
   nextcloudnet-$DOMAIN_IDENTIFIER-en:
     attachable: true
 
 EOL
-        fi
+                fi
 
-
-        if [ "$DEPLOY_NOSTR_RELAY" = "true" ]; then
-            cat >> "$DOCKER_YAML_PATH" <<EOL
-  nostrnet-$DOMAIN_IDENTIFIER:
+                if [ "$DEPLOY_NOSTR_RELAY" = true ]; then
+                    cat >> "$DOCKER_YAML_PATH" <<EOL
+  nostrnet-$DOMAIN_IDENTIFIER-en:
     attachable: true
 
 EOL
-        fi
-
+                fi
+            fi
+        done
     done
 
 docker stack deploy -c "$DOCKER_YAML_PATH" "reverse-proxy"

deployment/www/stub/nostr_yml.sh

@@ -3,6 +3,8 @@
 set -exu
 cd "$(dirname "$0")"
 
+docker pull "$NOSTR_RELAY_IMAGE"
+
 for DOMAIN_NAME in ${DOMAIN_LIST//,/ }; do
     export DOMAIN_NAME="$DOMAIN_NAME"
     export SITE_PATH="$SITES_PATH/$DOMAIN_NAME"
@@ -15,6 +17,7 @@ for DOMAIN_NAME in ${DOMAIN_LIST//,/ }; do
     if [ "$DEPLOY_NOSTR_RELAY" = true ]; then
         REMOTE_NOSTR_PATH="$REMOTE_HOME/nostr"
         NOSTR_PATH="$REMOTE_NOSTR_PATH/$DOMAIN_NAME"
+        NOSTR_CONFIG_PATH="$SITE_PATH/webstack/nostr.config"
 
         ssh "$PRIMARY_WWW_FQDN" mkdir -p "$NOSTR_PATH/data" "$NOSTR_PATH/db"
 
@@ -38,19 +41,41 @@ services:
     #   - USER_UID=1000
     networks:
       - ${NET_NAME}
+    configs:
+      - source: nostr-config
+        target: /usr/src/app/config.toml
     deploy:
       restart_policy:
         condition: on-failure
 
 networks:
-    ${NET_NAME}:
-      name: "reverse-proxy_${NET_NAME}"
-      external: true
+  ${NET_NAME}:
+    name: "reverse-proxy_${NET_NAME}-en"
+    external: true
 
+configs:
+  nostr-config:
+    file: ${NOSTR_CONFIG_PATH}
 EOL
 
-        docker pull "$NOSTR_RELAY_IMAGE"
-        docker stack deploy -c "$DOCKER_YAML_PATH" "$DOMAIN_IDENTIFIER-nostr"
+        # documentation: https://git.sr.ht/~gheartsfield/nostr-rs-relay/tree/0.7.0/item/config.toml
+        cat >>"$NOSTR_CONFIG_PATH" <<EOL
+[info]
+relay_url = "wss://${NOSTR_FQDN}/"
+name = "${DOMAIN_NAME}"
+
+# administrative contact pubkey TODO
+#pubkey = ""
+
+[options]
+reject_future_seconds = 1800
+
+[limits]
+messages_per_sec = 3
+#max_event_bytes = 131072
+EOL
+
+        docker stack deploy -c "$DOCKER_YAML_PATH" "$DOMAIN_IDENTIFIER-nostr-$LANGUAGE_CODE"
         sleep 1
     
     fi