New Changes

manifest.jps

@@ -1,5 +1,5 @@
 jpsType: install
-jpsVersion: '1.7.2'
+jpsVersion: '0.1'
 id: wordpress
 name: MightyBox WordPress Kit
 categories:
@@ -25,42 +25,38 @@ mixins:
  - /scripts/common.yml
 
 globals:
-  isSingleDeploy: true
+  isSingleDeploy: ${settings.isSingleDeploy:true}
   BASE_URL: https://deploy.mightybox.io/kits/wp-mb-kit/raw/branch/main
-  DB_USER: user-${fn.random}
+  DB_USER: ${settings.DB_USER:user-[fn.random]}
-  DB_PASS: ${fn.password(10)}
+  DB_PASS: ${settings.DB_PASS:[fn.password(10)]}
   DB_HOST: 127.0.0.1
   PROTOCOL: http
-  WP_ADMIN_PASS: ${fn.password(10)}
+  WP_ADMIN_PASS: ${settings.WP_ADMIN_PASS:[fn.password(10)]}
   SUCCESS: default
-  le-addon: true
-  DOMAIN: ${env.domain}
-  WP_ADMIN_PASS: ${fn.password(10)}
-  WP_TITLE: ${env.domain}
-  WP_URL: ${globals.PROTOCOL}://${globals.DOMAIN}/
 
 onInstall:
   - addLimits
   - addMetadata
   - initLEsettings  
-  - setupNode
+  - setupNode:
+      nodeId: cp
   - if (${globals.isSingleDeploy}):
     - setProtocol
     - setDomain            
     - createUserDB
     - installWordpress 
-    - if (${globals.le-addon}): 
+    - if (${settings.le-addon:false}): 
-        - installLEaddon
+      - installLEaddon
-        - setupLEdomain
+      - setupLEdomain
     - installMBaddons   
     - install: 
-        - jps: /scripts/events.jps?_r=${fn.random}
+      - jps: /scripts/events.jps?_r=${fn.random}
-        - jps: ${globals.BASE_URL}/scripts/addons.jps?_r=${fn.random}
+      - jps: ${globals.BASE_URL}/scripts/addons.jps?_r=${fn.random}
     - if ('${settings.success_email}' != 'false'):
-        - return:
+      - return:
-            type: success
+          type: success
-            message: /success/text/success-${globals.SUCCESS}.md?_r=${fn.random}
+          message: /success/text/success-${globals.SUCCESS}.md?_r=${fn.random}
-            email: /success/email/success-${nodes.cp.master.nodeType}-${globals.SUCCESS}.md?_r=${fn.random}
+          email: /success/email/success-${nodes.cp.master.nodeType}-${globals.SUCCESS}.md?_r=${fn.random}
 
 actions:
   addLimits:
@@ -73,17 +69,16 @@ actions:
     script: |
       var metadata = { project: "${settings.project:default}", projectScope: "${settings.projectScope:production}" };
       return api.env.control.ApplyEnvProperty ?
-        api.env.control.ApplyEnvProperty('${env.envName}', session, metadata) :
+        api.env.control.ApplyEnvProperty('${env.name}', session, metadata) :
-        api.env.control.ApplyNodeGroupData('${env.envName}', session, 'cp', metadata);
+        api.env.control.ApplyNodeGroupData('${env.name}', session, 'cp', metadata);
 
   setProtocol:
     - script: |
-        var resp = jelastic.billing.account.GetQuotas('environment.jelasticssl.enabled');
         return {
-          result: resp.result,
+          result:0,
-          ssl: resp.array[0] ? resp.array[0].value : false
+          ssl: jelastic.billing.account.GetQuotas('environment.jelasticssl.enabled').array[0].value
-        };
+        }
-    - if (${response.ssl} || ${globals.le-addon}):
+    - if (${response.ssl} || ${settings.le-addon:false}):
         setGlobals:
           PROTOCOL: https
 
@@ -94,7 +89,7 @@ actions:
         DOMAIN: ${response.domains} 
 
   installLEaddon:
-    - install: https://raw.githubusercontent.com/jelastic-jps/lets-encrypt/master/manifest.jps?_r=${fn.random}
+    - install: https://github.com/jelastic-jps/lets-encrypt/blob/master/manifest.jps?_r=${fn.random}
       nodeGroup: cp
       skipEmail: true
       settings:
@@ -105,11 +100,10 @@ actions:
 
   initLEsettings:
     - script: |
-        var resp = jelastic.billing.account.GetQuotas('environment.externalip.enabled');
         return {
-          result: resp.result,
+          result:0,
-          extIP: resp.array[0] ? Boolean(resp.array[0].value) : false
+          extIP: Boolean(jelastic.billing.account.GetQuotas('environment.externalip.enabled').array[0].value)
-        };
+        }
     - setGlobals:
         isExtIP: ${response.extIP}
 
@@ -124,8 +118,7 @@ actions:
   setupLEdomain:
     - cmd[cp]: |-
         source /opt/letsencrypt/settings;
-        bash ~/bin/setupWP.sh --url https://${globals.DOMAIN};
+        bash ~/bin/setupWP.sh --url https://${domain};
-      user: root
 
   installWordpress:
     - install: ${globals.BASE_URL}/scripts/installWP.jps
@@ -152,12 +145,12 @@ actions:
     - install: https://raw.githubusercontent.com/jelastic/templates/master/config_v2.jps?_r=${fn.random}
       settings:
         targetGroup: cp
-        targetNodes: ${nodes.cp.id}
+        targetNodes: ${this.nodeId}
         optimization: wordpress
         
   createUserDB:
     - log: Create user for DataBase
-    - cmd[cp]: |-
+    - cmd [cp]: |-
         wget https://raw.githubusercontent.com/jelastic-jps/wordpress-cluster/master/configs/sqldb/wordpress.cnf -O /etc/mysql/conf.d/wordpress.cnf &>> /var/log/run.log;
         wget https://deploy-proxy.mightybox.io/kits/wp-mb-kit/raw/branch/main/scripts/setupUser.sh -O ~/setupUser.sh &>> /var/log/run.log;
         bash ~/setupUser.sh ${globals.DB_USER} ${globals.DB_PASS} &>> /var/log/run.log;

scripts/beforeInit.js

@@ -3,10 +3,10 @@ var isLS = jelastic.dev.apps.GetApp(lsAppid);
 
 // Define settings statically
 var settings = {
-  phpVersion: "php8.3",       // Match variable name
+  phpVersion: "php8.3",
-  lsAddon: true,              // Simplify and match name
+  lsAddon: true, 
-  wafAddon: true,             // Simplify and match name
+  wafAddon: true,
-  wpProtectAddon: true        // Simplify and match name
+  wpProtectAddon: true
 };
 
 return {