--www will error if using with a subdomain

demyxsh · Feb 21, 2024 · 4cbaa65 · 4cbaa65
1 parent d9738a8
commit 4cbaa65
Showing 1 changed file with 17 additions and 17 deletions.
diff --git a/function/config.sh b/function/config.sh
@@ -1197,28 +1197,28 @@ demyx_config_www() {
         DEMYX_APP_STACK
     "
 
-    DEMYX_CONFIG_COMPOSE=true
-
     if [[ -n "$(demyx_subdomain "$DEMYX_APP_DOMAIN")" ]]; then
-        demyx_error custom "Not allowed with subdomains"
-    fi
+        demyx_warning "$DEMYX_ARG_2 is a subdomain, skipping --www flag ..."
+    else
+        DEMYX_CONFIG_COMPOSE=true
 
-    case "$DEMYX_CONFIG_FLAG_WWW" in
-        false)
-            demyx_execute "Updating domain to ${DEMYX_APP_DOMAIN}" \
-                "demyx_wordpress_ready; \
+        case "$DEMYX_CONFIG_FLAG_WWW" in
+            false)
+                demyx_execute "Updating domain to ${DEMYX_APP_DOMAIN}" \
+                    "demyx_wordpress_ready; \
                     demyx_wp $DEMYX_APP_DOMAIN search-replace --precise --all-tables $(demyx_app_proto)://www.${DEMYX_APP_DOMAIN} $(demyx_app_proto)://${DEMYX_APP_DOMAIN}"
-        ;;
-        true)
-            demyx_execute "Updating domain to www.${DEMYX_APP_DOMAIN}" \
-                "demyx_wordpress_ready; \
+            ;;
+            true)
+                demyx_execute "Updating domain to www.${DEMYX_APP_DOMAIN}" \
+                    "demyx_wordpress_ready; \
                     demyx_wp $DEMYX_APP_DOMAIN search-replace --precise --all-tables $(demyx_app_proto)://${DEMYX_APP_DOMAIN} $(demyx_app_proto)://www.${DEMYX_APP_DOMAIN}"
-        ;;
-    esac
+            ;;
+        esac
 
-    demyx_execute "Setting www to $DEMYX_CONFIG_FLAG_WWW" \
-        "demyx_app_env_update DEMYX_APP_DOMAIN_WWW=${DEMYX_CONFIG_FLAG_WWW}; \
-        demyx_yml $DEMYX_APP_STACK"
+        demyx_execute "Setting www to $DEMYX_CONFIG_FLAG_WWW" \
+            "demyx_app_env_update DEMYX_APP_DOMAIN_WWW=${DEMYX_CONFIG_FLAG_WWW}; \
+            demyx_yml $DEMYX_APP_STACK"
+    fi
 }
 #
 #   Configures an app's xmlrpc setting.