Revised common.yml

configs/vers.yaml

@@ -1,4 +1,4 @@
 globals:
-  version_lscache: 6.2.0.1
-  version_wordpress: 6.5
+  version_lscache: 6.5.0.2
+  version_wordpress: 6.6.2
   

manifest-OLD.jps

@@ -0,0 +1,170 @@
+jpsType: install
+jpsVersion: '1.7.2'
+id: wordpress
+name: MightyBox WordPress Kit
+categories:
+  - apps/blogs
+  - apps/content-management
+  - apps/wordpress
+logo: https://raw.githubusercontent.com/jelastic-jps/wordpress/master/images/wp-standalone.png
+homepage: http://wordpress.org/
+description:
+  text: MightyBox standalone WordPress kit with built-in tools for optimizing application servers and advanced features for running websites efficiently. The lightweight WordPress CMS is deployed in its own container with minimal resources to keep costs low.
+  short: MightyBox WordPress Standalone with built-in kit for choosing optimal application servers and a set of advanced features for running websites and blogs
+
+baseUrl: https://deploy.mightybox.io/kits/wp-mb-kit/raw/branch/main
+
+onBeforeInit: /scripts/beforeInit.js?_r=${fn.random}
+onBeforeInstall: /scripts/beforeInstall.js?_r=${fn.random}
+nodes: definedInOnBeforeInstall
+
+skipNodeEmails: true
+
+mixins:
+ - https://deploy.mightybox.io/kits/wp-mb-kit/raw/branch/main/configs/vers.yaml
+
+globals:
+  isSingleDeploy: true
+  ls-addon: true
+  wp_protect: true
+  waf: true
+  le-addon: true
+  cdn-addon: false
+  mu-addon: false
+  woocommerce: false
+  BASE_URL: https://deploy.mightybox.io/kits/wp-mb-kit/raw/branch/main
+  WP_CLUSTER_PATH: https://raw.githubusercontent.com/jelastic-jps/wordpress-cluster/v2.2.0
+  DB_USER: user-${fn.random}
+  DB_PASS: ${fn.password(10)}
+  DB_HOST: 127.0.0.1
+  PROTOCOL: http
+  WP_ADMIN_PASS: ${fn.password(10)}
+  SUCCESS: default
+  flexibleCloudlets: 16
+  fixedCloudlets: 1
+  storage_flexibleCloudlets: 6
+  storage_fixedCloudlets: 1
+  project: default
+  projectScope: production
+  success_email: false
+
+onInstall:
+  - limits
+  - initLEsettings  
+  - setupNode:
+      nodeId: cp
+  - if (${globals.isSingleDeploy}):
+    - setProtocol
+    - setDomain            
+    - createUserDB
+    - installWordpress 
+    - if (${globals.le-addon}): 
+        - installLEaddon
+        - setupLEdomain
+    - installMBaddons
+    - install: 
+        - jps: /scripts/events.jps?_r=${fn.random}
+        - jps: ${globals.BASE_URL}/scripts/addons.jps?_r=${fn.random}
+    - if (${globals.success_email} != 'false'):
+        - return:
+            type: success
+            message: /success/text/success-${globals.SUCCESS}.md?_r=${fn.random}
+            email: /success/email/success-${nodes.cp.master.nodeType}-${globals.SUCCESS}.md?_r=${fn.random}
+
+actions:
+  limits:
+    - env.control.ApplyNodeGroupData[cp]:
+        data:
+          project: ${globals.project}
+          projectScope: ${globals.projectScope}
+          validation : 
+            maxCount: 1
+
+  setProtocol:
+    - script: |
+        return {
+          result: 0,
+          ssl: jelastic.billing.account.GetQuotas('environment.jelasticssl.enabled').array[0].value
+        }
+    - if (${response.ssl} || ${globals.le-addon}):
+        setGlobals:
+          PROTOCOL: https
+
+  setDomain:
+    - script: ${globals.BASE_URL}/scripts/idna.js
+      domains: ${env.domain}
+    - setGlobals:
+        DOMAIN: ${response.domains} 
+
+  installLEaddon:
+    - install: https://github.com/jelastic-jps/lets-encrypt/blob/master/manifest.jps?_r=${fn.random}
+      nodeGroup: cp
+      skipEmail: true
+      settings:
+        test: false
+        fallbackToX1: true
+        withExtIp: ${globals.isExtIP}
+
+  initLEsettings:
+    - script: |
+        return {
+          result: 0,
+          extIP: Boolean(jelastic.billing.account.GetQuotas('environment.externalip.enabled').array[0].value)
+        }
+    - setGlobals:
+        isExtIP: ${response.extIP}
+
+    - cmd[cp]: |-
+        [ ! -d /var/lib/jelastic/keys/letsencrypt ] && mkdir -p /var/lib/jelastic/keys/letsencrypt;
+        echo "webroot=true" > /var/lib/jelastic/keys/letsencrypt/settings-custom;
+        echo "webrootPath=/var/www/webroot/ROOT" >> /var/lib/jelastic/keys/letsencrypt/settings-custom;
+        echo "test=false" >> /var/lib/jelastic/keys/letsencrypt/settings-custom;
+        echo "withExtIp=${globals.isExtIP}" >> /var/lib/jelastic/keys/letsencrypt/settings-custom;
+      user: root
+
+  setupLEdomain:
+    - cmd[cp]: |-
+        source /opt/letsencrypt/settings;
+        bash ~/bin/setupWP.sh --url https://${DOMAIN};
+
+  installWordpress:
+    - install: ${globals.BASE_URL}/scripts/installWP.jps
+      settings:
+        db_host: ${globals.DB_HOST}
+        db_user: ${globals.DB_USER}
+        db_pass: ${globals.DB_PASS}
+        redis_host: /var/run/redis/redis.sock
+        redis_port: 0
+        wp_admin_pass: ${globals.WP_ADMIN_PASS}
+        wp_title: "Hello World"
+        wp_url: ${globals.PROTOCOL}://${globals.DOMAIN}/
+        cluster: false
+
+  installMBaddons:
+    - install: https://deploy.mightybox.io/addons/mb-backup-manager/raw/branch/main/manifest.jps
+      nodeGroup: cp
+
+    - install: https://deploy.mightybox.io/addons/instant-login/raw/branch/main/manifest.jps
+      nodeGroup: cp
+
+    - install: https://deploy.mightybox.io/tony/mb-admin/raw/branch/main/mbadmin.jps  
+      nodeGroup: cp
+
+  setupNode:
+    - log: OPTIMIZATION
+    - install: https://raw.githubusercontent.com/jelastic/templates/master/config_v2.jps?_r=${fn.random}
+      settings:
+        targetGroup: cp
+        targetNodes: ${this.nodeId}
+        optimization: wordpress
+        
+  createUserDB:
+    - log: Create user for DataBase
+    - 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 ${globals.BASE_URL}/scripts/setupUser.sh -O ~/setupUser.sh &>> /var/log/run.log;
+        bash ~/setupUser.sh ${globals.DB_USER} ${globals.DB_PASS} &>> /var/log/run.log;
+        jem passwd set -p ${globals.DB_PASS} &>> /var/log/run.log;
+      user: root
+
+startPage: ${env.url}

manifest.jps

@@ -1,5 +1,5 @@
 jpsType: install
-jpsVersion: '0.1'
+jpsVersion: '1.7.2'
 id: wordpress
 name: MightyBox WordPress Kit
 categories:
@@ -22,21 +22,34 @@ skipNodeEmails: true
 
 mixins:
  - https://deploy.mightybox.io/kits/wp-mb-kit/raw/branch/main/configs/vers.yaml
- - /scripts/common.yml
 
 globals:
-  isSingleDeploy: ${settings.isSingleDeploy:true}
+  isSingleDeploy: true
+  ls-addon: true
+  wp_protect: true
+  waf: true
+  le-addon: true
+  cdn-addon: false
+  mu-addon: false
+  woocommerce: false
   BASE_URL: https://deploy.mightybox.io/kits/wp-mb-kit/raw/branch/main
-  DB_USER: ${settings.DB_USER:user-[fn.random]}
-  DB_PASS: ${settings.DB_PASS:[fn.password(10)]}
+  WP_CLUSTER_PATH: https://raw.githubusercontent.com/jelastic-jps/wordpress-cluster/v2.2.0
+  DB_USER: user-${fn.random}
+  DB_PASS: ${fn.password(10)}
   DB_HOST: 127.0.0.1
   PROTOCOL: http
-  WP_ADMIN_PASS: ${settings.WP_ADMIN_PASS:[fn.password(10)]}
+  WP_ADMIN_PASS: ${fn.password(10)}
   SUCCESS: default
+  flexibleCloudlets: 16
+  fixedCloudlets: 1
+  storage_flexibleCloudlets: 6
+  storage_fixedCloudlets: 1
+  project: default
+  projectScope: production
+  success_email: false
 
 onInstall:
-  - addLimits
-  - addMetadata
+  - limits
   - initLEsettings  
   - setupNode:
       nodeId: cp
@@ -45,40 +58,35 @@ onInstall:
     - setDomain            
     - createUserDB
     - installWordpress 
-    - if (${settings.le-addon:false}): 
-      - installLEaddon
-      - setupLEdomain
+    - if (${globals.le-addon}): 
+        - installLEaddon
+        - setupLEdomain
     - installMBaddons
     - install: 
-      - jps: /scripts/events.jps?_r=${fn.random}
-      - jps: ${globals.BASE_URL}/scripts/addons.jps?_r=${fn.random}
-    - if ('${settings.success_email}' != 'false'):
-      - return:
-          type: success
-          message: /success/text/success-${globals.SUCCESS}.md?_r=${fn.random}
-          email: /success/email/success-${nodes.cp.master.nodeType}-${globals.SUCCESS}.md?_r=${fn.random}
+        - jps: /scripts/events.jps?_r=${fn.random}
+        - jps: ${globals.BASE_URL}/scripts/addons.jps?_r=${fn.random}
+    - if (${globals.success_email} != 'false'):
+        - return:
+            type: success
+            message: /success/text/success-${globals.SUCCESS}.md?_r=${fn.random}
+            email: /success/email/success-${nodes.cp.master.nodeType}-${globals.SUCCESS}.md?_r=${fn.random}
 
 actions:
-  addLimits:
+  limits:
     - env.control.ApplyNodeGroupData[cp]:
         data:
+          project: ${globals.project}
+          projectScope: ${globals.projectScope}
           validation : 
             maxCount: 1
 
-  addMetadata:
-    script: |
-      var metadata = { project: "${settings.project:default}", projectScope: "${settings.projectScope:production}" };
-      return api.env.control.ApplyEnvProperty ?
-        api.env.control.ApplyEnvProperty('${env.name}', session, metadata) :
-        api.env.control.ApplyNodeGroupData('${env.name}', session, 'cp', metadata);
-
   setProtocol:
     - script: |
         return {
-          result:0,
+          result: 0,
           ssl: jelastic.billing.account.GetQuotas('environment.jelasticssl.enabled').array[0].value
         }
-    - if (${response.ssl} || ${settings.le-addon:false}):
+    - if (${response.ssl} || ${globals.le-addon}):
         setGlobals:
           PROTOCOL: https
 
@@ -94,14 +102,13 @@ actions:
       skipEmail: true
       settings:
         test: false
-        skipEmail: true
         fallbackToX1: true
         withExtIp: ${globals.isExtIP}
 
   initLEsettings:
     - script: |
         return {
-          result:0,
+          result: 0,
           extIP: Boolean(jelastic.billing.account.GetQuotas('environment.externalip.enabled').array[0].value)
         }
     - setGlobals:
@@ -118,7 +125,7 @@ actions:
   setupLEdomain:
     - cmd[cp]: |-
         source /opt/letsencrypt/settings;
-        bash ~/bin/setupWP.sh --url https://${domain};
+        bash ~/bin/setupWP.sh --url https://${DOMAIN};
 
   installWordpress:
     - install: ${globals.BASE_URL}/scripts/installWP.jps
@@ -140,6 +147,9 @@ actions:
     - install: https://deploy.mightybox.io/addons/instant-login/raw/branch/main/manifest.jps
       nodeGroup: cp
 
+    - install: https://deploy.mightybox.io/tony/mb-admin/raw/branch/main/mbadmin.jps  
+      nodeGroup: cp
+
   setupNode:
     - log: OPTIMIZATION
     - install: https://raw.githubusercontent.com/jelastic/templates/master/config_v2.jps?_r=${fn.random}
@@ -150,9 +160,9 @@ actions:
         
   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;
+        wget ${globals.BASE_URL}/scripts/setupUser.sh -O ~/setupUser.sh &>> /var/log/run.log;
         bash ~/setupUser.sh ${globals.DB_USER} ${globals.DB_PASS} &>> /var/log/run.log;
         jem passwd set -p ${globals.DB_PASS} &>> /var/log/run.log;
       user: root

scripts/beforeInit-OLD.js

@@ -0,0 +1,19 @@
+import com.hivext.api.Response;
+import org.yaml.snakeyaml.Yaml;
+import com.hivext.api.core.utils.Transport;
+
+var lsAppid = "9e6afcf310004ac84060f90ff41a5aba";
+var isLS = jelastic.dev.apps.GetApp(lsAppid);
+
+// Define settings statically as form fields are removed
+var settings = {
+  "php_version": "php8.3",  // PHP version is always set to PHP 8.3
+  "ls-addon": { "hidden": false, "value": true },  // Always enabled
+  "waf-addon": { "hidden": false, "value": true },  // Always enabled
+  "wp_protect-addon": { "hidden": false, "value": true }  // Always enabled
+};
+
+return {
+  result: 0,
+  settings: settings
+};

scripts/beforeInstall.js

@@ -6,35 +6,22 @@ var resp = {
   nodes: []
 }
 
-if ('${settings.ls-addon:false}'== 'true') {
-  resp.nodes.push({
+resp.nodes.push({
     nodeType: "llsmp",
+    engine: "${settings.php_engine:php8.3}",
     count: 1,
-    flexibleCloudlets: ${settings.flexibleCloudlets:16},
-    fixedCloudlets: ${settings.fixedCloudlets:1},
+    cloudlets: "${settings.cloudlets:16}",
+    diskLimit: "${settings.diskspace:[quota.disk.limitation]}",
     nodeGroup: "cp",
+    skipNodeEmails: "true",
     displayName: "AppServer",
     env: {
-      SERVER_WEBROOT: "/var/www/webroot/ROOT",
-      REDIS_ENABLED: "true",
-      WAF: "${settings.waf}",
-      WP_PROTECT: wpbfp,
-      WP_PROTECT_LIMIT: 100
+    SERVER_WEBROOT: "/var/www/webroot/ROOT",
+    REDIS_ENABLED: "true",
+    WAF: "${settings.waf}",
+    WP_PROTECT: wpbfp,
+    WP_PROTECT_LIMIT: 100
     }
   })
-} else {
-  resp.nodes.push({
-    nodeType: "lemp",
-    count: 1,
-    flexibleCloudlets: ${settings.flexibleCloudlets:16},
-    fixedCloudlets: ${settings.fixedCloudlets:1},
-    nodeGroup: "cp",
-    displayName: "AppServer",
-    env: {
-      SERVER_WEBROOT: "/var/www/webroot/ROOT",
-      REDIS_ENABLED: "true"
-    }
-  })
-}
 
 return resp;

scripts/common.yml

@@ -2,96 +2,18 @@ actions:
   applyEnvSettings:
     script: |
       var envs = '${this.targetAppid}'.split(',');
-      let nodes = [];
-      let nodeGroups = [], node, nodesByGroup, cloudlets, diskspace, count;
-      
-      function getNodesByGroup(targetAppid, group) {
-        let groupNodes = [];
-        let resp = jelastic.env.control.GetEnvInfo(targetAppid, session);
-        if (resp.result != 0) return resp;
-        let nodes = resp.nodes;
-        for (let i = 0, n = nodes.length; i < n; i++) {
-            if (nodes[i].nodeGroup == group) {
-                groupNodes.push(nodes[i]);
-            }
-        }
-        return { result: 0, nodes: groupNodes }
-      };
-      
       for (var i=0, n = envs.length; i < n; i++) {
         let targetAppid = envs[i];
         let resp = jelastic.env.control.GetEnvInfo(targetAppid, session);
         if (resp.result != 0) return resp;
-        
-        var env = resp.env;
-        
-        for (let i = 0, n = resp.nodes.length; i < n; i++) {
-            node = resp.nodes[i];
-
-            if (nodeGroups.indexOf(String(node.nodeGroup)) == -1) {
-                nodeGroups.push(String(node.nodeGroup));
-                
-                nodesByGroup = getNodesByGroup(targetAppid, node.nodeGroup);
-                if (nodesByGroup.result != 0) return nodesByGroup;
-                
-                cloudlets = node.flexibleCloudlets;
-                diskspace = node.diskLimit / 1000;                
-                count = nodesByGroup.nodes.length;
-                
-                if (node.nodeGroup == 'bl') {
-                  if (!/cloudlets/.test('${this.bl.cloudlets}'))
-                    cloudlets = String(node.flexibleCloudlets) != '${this.bl.cloudlets}' ? '${this.bl.cloudlets}' : node.flexibleCloudlets;
-                  if (!/diskspace/.test('${this.bl.diskspace}'))
-                    diskspace = String(diskspace) != '${this.bl.diskspace}' ? '${this.bl.diskspace}' : diskspace;
-                  if (!/nodes/.test('${this.bl.nodes}'))
-                    count = String(nodesByGroup.nodes.length) != '${this.bl.nodes}' ? '${this.bl.nodes}' : nodesByGroup.nodes.length;    
-                }
-                
-                if (node.nodeGroup == 'cp') {
-                  if (!/cloudlets/.test('${this.cp.cloudlets}'))
-                    cloudlets = String(node.flexibleCloudlets) != '${this.cp.cloudlets}' ? '${this.cp.cloudlets}' : node.flexibleCloudlets;
-                  if (!/diskspace/.test('${this.cp.diskspace}'))
-                    diskspace = String(node.diskLimit) != '${this.cp.diskspace}' ? '${this.cp.diskspace}' : node.diskLimit;
-                  if (!/nodes/.test('${this.cp.nodes}'))
-                    count = String(nodesByGroup.nodes.length) != '${this.cp.nodes}' ? '${this.cp.nodes}' : nodesByGroup.nodes.length;    
-                }                
-                
-                if (node.nodeGroup == 'sqldb') {
-                  if (!/cloudlets/.test('${this.sqldb.cloudlets}'))
-                    cloudlets = String(node.flexibleCloudlets) != '${this.sqldb.cloudlets}' ? '${this.sqldb.cloudlets}' : node.flexibleCloudlets;
-                  if (!/diskspace/.test('${this.sqldb.diskspace}'))
-                    diskspace = String(node.diskLimit) != '${this.sqldb.diskspace}' ? '${this.sqldb.diskspace}' : node.diskLimit;
-                }                
-                
-                if (node.nodeGroup == 'nosqldb') {
-                  if (!/cloudlets/.test('${this.nosqldb.cloudlets}'))
-                    cloudlets = String(node.flexibleCloudlets) != '${this.nosqldb.cloudlets}' ? '${this.nosqldb.cloudlets}' : node.flexibleCloudlets;
-                  if (!/diskspace/.test('${this.nosqldb.diskspace}'))
-                    diskspace = String(node.diskLimit) != '${this.nosqldb.diskspace}' ? '${this.nosqldb.diskspace}' : node.diskLimit;
-                }              
-
-                if (node.nodeGroup == 'storage') {
-                  if (!/cloudlets/.test('${this.storage.cloudlets}'))
-                    cloudlets = String(node.flexibleCloudlets) != '${this.storage.cloudlets}' ? '${this.storage.cloudlets}' : node.flexibleCloudlets;
-                  if (!/diskspace/.test('${this.storage.diskspace}'))
-                    diskspace = String(node.diskLimit) != '${this.storage.diskspace}' ? '${this.storage.diskspace}' : node.diskLimit;
-                }
-                
-                nodes.push({
-                    flexibleCloudlets: cloudlets,
-                    fixedCloudlets: node.fixedCloudlets,
-                    nodeType: node.nodeType,
-                    nodeGroup: node.nodeGroup,
-                    diskLimit: diskspace,
-                    count: count
-                });
-            }
+        let node = resp.nodes[0];
+        if (String(node.flexibleCloudlets) != '${this.cloudlets}') {
+          resp = jelastic.env.control.SetCloudletsCountByGroup({ appid: targetAppid, session: session, nodeGroup: node.nodeGroup, fixedCloudlets: node.fixedCloudlets, flexibleCloudlets: '${this.cloudlets}'});
+          if (resp.result != 0) return resp;
+        }
+        if (String(node.diskLimit) != '${this.diskspace}') {
+          resp = jelastic.env.control.SetDiskLimitByGroup({ appid: targetAppid, session: session, nodeGroup: node.nodeGroup, limit: '${this.diskspace}' });
+          if (resp.result != 0) return resp;
         }
-        resp = api.env.control.ChangeTopology({
-          envName: targetAppid,
-          session: session,
-          env: env,
-          nodes: nodes
-        });
       }
       return { result: 0 };