underpost 2.8.814 → 2.8.815

package/README.md

@@ -68,7 +68,7 @@ Run dev client server
 npm run dev
 ```
 <!-- -->
-## underpost ci/cd cli v2.8.814
+## underpost ci/cd cli v2.8.815
 
 ### Usage: `underpost [options] [command]`
   ```

package/bin/deploy.js

@@ -51,52 +51,50 @@ logger.info('argv', process.argv);
 
 const [exe, dir, operator] = process.argv;
 
-const updateVirtualRoot = async ({ IP_ADDRESS, architecture, host, nfsHostPath, ipaddr, update, gatewayip }) => {
-  // <consumer_key>:<consumer_token>:<secret>
-  const MAAS_API_TOKEN = shellExec(`maas apikey --username ${process.env.MAAS_ADMIN_USERNAME}`, {
-    stdout: true,
-  }).trim();
-  const [consumer_key, consumer_token, secret] = MAAS_API_TOKEN.split(`\n`)[0].split(':');
-  const chronyConfPath = `/etc/chrony/chrony.conf`;
-  const timezone = 'America/New_York';
-
-  const timeZoneSteps = [
-    `export DEBIAN_FRONTEND=noninteractive`,
-
-    `ln -fs /usr/share/zoneinfo/${timezone} /etc/localtime`,
-
-    `sudo dpkg-reconfigure --frontend noninteractive tzdata`,
-  ];
-  const keyboardSteps = [
-    `sudo locale-gen en_US.UTF-8`,
-    `sudo update-locale LANG=en_US.UTF-8`,
-    `sudo sed -i 's/XKBLAYOUT="us"/XKBLAYOUT="es"/' /etc/default/keyboard`,
-    `sudo dpkg-reconfigure --frontend noninteractive keyboard-configuration`,
-    `sudo systemctl restart keyboard-setup.service`,
-  ];
-  // #  - ${JSON.stringify([...timeZoneSteps, ...chronySetUp(chronyConfPath)])}
-  const installSteps = [
-    `cat <<EOF | tee /etc/apt/sources.list
+const chronyConfPath = `/etc/chrony/chrony.conf`;
+
+const timezone = 'America/New_York';
+
+const timeZoneSteps = [
+  `export DEBIAN_FRONTEND=noninteractive`,
+
+  `ln -fs /usr/share/zoneinfo/${timezone} /etc/localtime`,
+
+  `sudo dpkg-reconfigure --frontend noninteractive tzdata`,
+];
+const keyboardSteps = [
+  `sudo locale-gen en_US.UTF-8`,
+  `sudo update-locale LANG=en_US.UTF-8`,
+  `sudo sed -i 's/XKBLAYOUT="us"/XKBLAYOUT="es"/' /etc/default/keyboard`,
+  `sudo dpkg-reconfigure --frontend noninteractive keyboard-configuration`,
+  `sudo systemctl restart keyboard-setup.service`,
+];
+// #  - ${JSON.stringify([...timeZoneSteps, ...chronySetUp(chronyConfPath)])}
+const installSteps = [
+  `cat <<EOF | tee /etc/apt/sources.list
 deb http://ports.ubuntu.com/ubuntu-ports noble main restricted universe multiverse
 deb http://ports.ubuntu.com/ubuntu-ports noble-updates main restricted universe multiverse
 deb http://ports.ubuntu.com/ubuntu-ports noble-security main restricted universe multiverse
 EOF`,
 
-    `apt update -qq`,
-    `apt -y full-upgrade`,
-    `apt install -y xinput x11-xkb-utils usbutils`,
-    // `apt install -y cloud-init=25.1.2-0ubuntu0~24.04.1`,
-    `apt install -y cloud-init systemd-sysv openssh-server sudo locales udev util-linux systemd-sysv iproute2 netplan.io ca-certificates curl wget chrony`,
-    `ln -sf /lib/systemd/systemd /sbin/init`,
-
-    `apt-get update`,
-    `DEBIAN_FRONTEND=noninteractive apt-get install -y apt-utils`,
-    `DEBIAN_FRONTEND=noninteractive apt-get install -y tzdata kmod keyboard-configuration console-setup`,
-  ];
-
-  let steps = [
-    // Configure cloud-init for MAAS
-    `cat <<EOF_MAAS_CFG > /etc/cloud/cloud.cfg.d/90_maas.cfg
+  `apt update -qq`,
+  `apt -y full-upgrade`,
+  `apt install -y xinput x11-xkb-utils usbutils`,
+  // `apt install -y cloud-init=25.1.2-0ubuntu0~24.04.1`,
+  `apt install -y cloud-init systemd-sysv openssh-server sudo locales udev util-linux systemd-sysv iproute2 netplan.io ca-certificates curl wget chrony`,
+  `ln -sf /lib/systemd/systemd /sbin/init`,
+
+  `apt-get update`,
+  `DEBIAN_FRONTEND=noninteractive apt-get install -y apt-utils`,
+  `DEBIAN_FRONTEND=noninteractive apt-get install -y tzdata kmod keyboard-configuration console-setup iputils-ping`,
+];
+
+const cloudConfigFactory = (
+  { IP_ADDRESS, architecture, host, nfsHostPath, ipaddr, update, gatewayip },
+  { consumer_key, consumer_token, secret },
+) => [
+  // Configure cloud-init for MAAS
+  `cat <<EOF_MAAS_CFG > /etc/cloud/cloud.cfg.d/90_maas.cfg
 #cloud-config
 
 hostname: ${host}
@@ -114,37 +112,40 @@ hostname: ${host}
 datasource_list: [ MAAS ]
 datasource:
   MAAS:
-    metadata_url: http://${IP_ADDRESS}:5240/MAAS/metadata
+    metadata_url: http://${IP_ADDRESS}:5248/MAAS/metadata
     consumer_key: ${consumer_key}
     token_key: ${consumer_token}
     token_secret: ${secret}
+
 users:
-  - name: rpiadmin
-    sudo: ['ALL=(ALL) NOPASSWD:ALL']
-    shell: /bin/bash
-    lock_passwd: true
-    ssh_authorized_keys:
-      - ${fs.readFileSync(`/home/dd/engine/engine-private/deploy/id_rsa.pub`, 'utf8')}
+- name: root
+  sudo: ['ALL=(ALL) NOPASSWD:ALL']
+  shell: /bin/bash
+  lock_passwd: true
+  ssh_authorized_keys:
+    - ${fs.readFileSync(`/home/dd/engine/engine-private/deploy/id_rsa.pub`, 'utf8')}
 
+# manage_resolv_conf: true
+# resolv_conf:
+#   nameservers: [8.8.8.8]
 
 # keyboard:
 #   layout: es
 
-  
 # check timedatectl on host
 # timezone: America/Santiago
-timezone: ${timezone}
-
-ntp:
-  enabled: true
-  servers:
-    - ${IP_ADDRESS}
-  ntp_client: chrony
-  config:
-    confpath: ${chronyConfPath}
-    packages:
-      - chrony
-    service_name: chrony
+# timezone: ${timezone}
+
+# ntp:
+#   enabled: true
+#   servers:
+#     - ${IP_ADDRESS}
+#   ntp_client: chrony
+#   config:
+#     confpath: ${chronyConfPath}
+#     packages:
+#       - chrony
+#     service_name: chrony
 
 # ssh:
 #   allow-pw: false
@@ -161,13 +162,13 @@ packages:
 resize_rootfs: false
 growpart:
   mode: off
-network:
-  version: 2
-  ethernets:
-    ${process.env.RPI4_INTERFACE_NAME}:
-        dhcp4: true
-        addresses:
-          - ${ipaddr}/24
+# network:
+#   version: 2
+#   ethernets:
+#     ${process.env.RPI4_INTERFACE_NAME}:
+#         dhcp4: true
+#         addresses:
+#           - ${ipaddr}/24
 #         routes:
 #           - to: default
 #             via: ${gatewayip}
@@ -175,7 +176,7 @@ network:
 # chpasswd:
 #   expire: false
 #   users:
-#   - {name: rpiadmin, password: changeme, type: text}
+#   - {name: root, password: changeme, type: text}
 
 final_message: "The system is up, after $UPTIME seconds"
 
@@ -193,86 +194,21 @@ runcmd:
   - echo "Init runcmd"
   - echo "- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -"
 EOF_MAAS_CFG`,
-  ];
+];
 
-  const runSteps = (steps = []) => {
-    const script = steps
-      .map(
-        (s, i) => `echo "step ${i + 1}/${steps.length}: ${s.split('\n')[0]}"
+const runSteps = (nfsHostPath, steps = []) => {
+  const script = steps
+    .map(
+      (s, i) => `echo "step ${i + 1}/${steps.length}: ${s.split('\n')[0]}"
 ${s}`,
-      )
-      .join('\n');
+    )
+    .join('\n');
 
-    const cmd = `sudo chroot ${nfsHostPath} /usr/bin/qemu-aarch64-static /bin/bash <<'EOF_OUTER'
+  const cmd = `sudo chroot ${nfsHostPath} /usr/bin/qemu-aarch64-static /bin/bash <<'EOF_OUTER'
 ${script}
 EOF_OUTER`;
 
-    shellExec(cmd);
-  };
-
-  if (update) {
-    // --reboot
-    shellExec(`sudo chroot ${nfsHostPath} /usr/bin/qemu-aarch64-static /bin/bash <<'EOF'
-sudo cloud-init clean --logs --seed --configs all --machine-id
-sudo rm -rf /var/lib/cloud/*
-EOF`);
-
-    if (fs.existsSync(`${nfsHostPath}/var/log/`)) {
-      fs.writeFileSync(`${nfsHostPath}/var/log/cloud-init.log`, '', 'utf8');
-      fs.writeFileSync(`${nfsHostPath}/var/log/cloud-init-output.log`, '', 'utf8');
-    }
-
-    runSteps(steps);
-  } else {
-    runSteps(installSteps.concat(steps));
-
-    shellExec(`sudo chroot ${nfsHostPath} /usr/bin/qemu-aarch64-static /bin/bash <<'EOF'
-echo "nameserver ${process.env.MAAS_DNS}" | tee /etc/resolv.conf > /dev/null
-apt update
-EOF`);
-    fs.writeFileSync(
-      `${nfsHostPath}/dns.sh`,
-      `rm /etc/resolv.conf
-echo 'nameserver 8.8.8.8' > /run/systemd/resolve/stub-resolv.conf
-ln -sf /run/systemd/resolve/stub-resolv.conf /etc/resolv.conf`,
-      'utf8',
-    );
-
-    runSteps([
-      // `date -s "${shellExec(`date '+%Y-%m-%d %H:%M:%S'`, { stdout: true }).trim()}"`,
-      // `date`,
-      ...timeZoneSteps,
-      ...chronySetUp(chronyConfPath),
-      ...keyboardSteps,
-    ]);
-
-    runSteps([
-      `useradd -m -s /bin/bash -G sudo root`,
-      `echo 'root:root' | chpasswd`,
-      `mkdir -p /home/root/.ssh`,
-      `echo '${fs.readFileSync(
-        `/home/dd/engine/engine-private/deploy/id_rsa.pub`,
-        'utf8',
-      )}' > /home/root/.ssh/authorized_keys`,
-      `chown -R root /home/root/.ssh`,
-      `chmod 700 /home/root/.ssh`,
-      `chmod 600 /home/root/.ssh/authorized_keys`,
-    ]);
-  }
-
-  logger.info('Check virtual root user config');
-  {
-    const cmd = `sudo chroot ${nfsHostPath} /usr/bin/qemu-aarch64-static /bin/bash <<'EOF_OUTER'
-echo -e "\n=== Current date/time ==="
-date '+%Y-%m-%d %H:%M:%S'
-echo -e "\n=== Keyboard layout ==="
-cat /etc/default/keyboard
-echo -e "\n=== Registered users ==="
-cut -d: -f1 /etc/passwd
-EOF_OUTER`;
-
-    shellExec(cmd);
-  }
+  shellExec(cmd);
 };
 
 const chronySetUp = (path) => {
@@ -336,6 +272,155 @@ logdir /var/log/chrony
   ];
 };
 
+const installUbuntuUnderpostTools = (nfsHostPath) => {
+  fs.mkdirSync(`${nfsHostPath}/underpost`, { recursive: true });
+
+  logger.info('Build', `${nfsHostPath}/underpost/date.sh`);
+  fs.writeFileSync(
+    `${nfsHostPath}/underpost/date.sh`,
+    `${timeZoneSteps.join('\n')}
+${chronySetUp(chronyConfPath).join('\n')}
+`,
+    'utf8',
+  );
+
+  logger.info('Build', `${nfsHostPath}/underpost/keyboard.sh`);
+  fs.writeFileSync(
+    `${nfsHostPath}/underpost/keyboard.sh`,
+    `${keyboardSteps.join('\n')}
+`,
+    'utf8',
+  );
+
+  logger.info('Build', `${nfsHostPath}/underpost/dns.sh`);
+  // echo "nameserver ${process.env.MAAS_DNS}" | tee /etc/resolv.conf > /dev/null
+  fs.writeFileSync(
+    `${nfsHostPath}/underpost/dns.sh`,
+    `rm /etc/resolv.conf
+echo 'nameserver 8.8.8.8' > /run/systemd/resolve/stub-resolv.conf
+ln -sf /run/systemd/resolve/stub-resolv.conf /etc/resolv.conf`,
+    'utf8',
+  );
+
+  logger.info('Build', `${nfsHostPath}/underpost/help.sh`);
+  fs.writeFileSync(
+    `${nfsHostPath}/underpost/help.sh`,
+    `echo "=== Cloud init utils ==="
+echo "sudo cloud-init --all-stages"
+echo "sudo cloud-init init --local"
+echo "sudo cloud-init init"
+echo "sudo cloud-init modules --mode=config"
+echo "sudo cloud-init modules --mode=final"`,
+    'utf8',
+  );
+
+  logger.info('Build', `${nfsHostPath}/underpost/test.sh`);
+  fs.writeFileSync(
+    `${nfsHostPath}/underpost/test.sh`,
+    `echo -e "\n=== Current date/time ==="
+date '+%Y-%m-%d %H:%M:%S'
+echo -e "\n=== Keyboard layout ==="
+cat /etc/default/keyboard
+echo -e "\n=== Registered users ==="
+cut -d: -f1 /etc/passwd
+    `,
+    'utf8',
+  );
+
+  logger.info('Build', `${nfsHostPath}/underpost/config-path.sh`);
+  fs.writeFileSync(`${nfsHostPath}/underpost/config-path.sh`, `echo "/etc/cloud/cloud.cfg.d/90_maas.cfg"`, 'utf8');
+
+  shellExec(`sudo rm -rf ${nfsHostPath}/root/.ssh`);
+  shellExec(`sudo rm -rf ${nfsHostPath}/home/root/.ssh`);
+
+  fs.copySync(`/root/.ssh`, `${nfsHostPath}/root/.ssh`);
+
+  logger.info('Run', `${nfsHostPath}/underpost/test.sh`);
+  runSteps(nfsHostPath, [
+    `chmod +x /underpost/date.sh`,
+    `chmod +x /underpost/keyboard.sh`,
+    `chmod +x /underpost/dns.sh`,
+    `chmod +x /underpost/help.sh`,
+    `chmod +x /underpost/config-path.sh`,
+    `chmod +x /underpost/test.sh`,
+    `sudo chmod 700 ~/.ssh/`,
+    `sudo chmod 600 ~/.ssh/authorized_keys`,
+    `sudo chmod 644 ~/.ssh/known_hosts`,
+    `sudo chmod 600 ~/.ssh/id_rsa`,
+    `sudo chmod 600 /etc/ssh/ssh_host_ed25519_key`,
+    `chown -R root:root ~/.ssh`,
+    `/underpost/test.sh`,
+  ]);
+};
+
+const updateVirtualRoot = async ({ IP_ADDRESS, architecture, host, nfsHostPath, ipaddr, update, gatewayip }) => {
+  // <consumer_key>:<consumer_token>:<secret>
+  let [consumer_key, consumer_token, secret] = process.argv.includes('reset')
+    ? shellExec(`maas apikey --username ${process.env.MAAS_ADMIN_USERNAME}`, {
+        stdout: true,
+      })
+        .trim()
+        .split(`\n`)[0]
+        .split(':')
+    : shellExec(`maas apikey --generate --username ${process.env.MAAS_ADMIN_USERNAME}`, {
+        stdout: true,
+      })
+        .trim()
+        .split(':');
+
+  if (process.argv.includes('reset')) secret = '&' + secret;
+
+  logger.info('Maas api token generated', { consumer_key, consumer_token, secret });
+
+  if (update) {
+    // --reboot
+    if (process.argv.includes('reset'))
+      shellExec(`sudo chroot ${nfsHostPath} /usr/bin/qemu-aarch64-static /bin/bash <<'EOF'
+sudo cloud-init clean --logs --seed --configs all --machine-id
+sudo rm -rf /var/lib/cloud/*
+EOF`);
+
+    if (fs.existsSync(`${nfsHostPath}/var/log/`)) {
+      fs.writeFileSync(`${nfsHostPath}/var/log/cloud-init.log`, '', 'utf8');
+      fs.writeFileSync(`${nfsHostPath}/var/log/cloud-init-output.log`, '', 'utf8');
+    }
+  } else {
+    runSteps(nfsHostPath, installSteps);
+    runSteps(nfsHostPath, [
+      `useradd -m -s /bin/bash -G sudo root`,
+      `echo 'root:root' | chpasswd`,
+      `mkdir -p /home/root/.ssh`,
+      `echo '${fs.readFileSync(
+        `/home/dd/engine/engine-private/deploy/id_rsa.pub`,
+        'utf8',
+      )}' > /home/root/.ssh/authorized_keys`,
+      `chown -R root /home/root/.ssh`,
+      `chmod 700 /home/root/.ssh`,
+      `chmod 600 /home/root/.ssh/authorized_keys`,
+    ]);
+    runSteps(nfsHostPath, [
+      // `date -s "${shellExec(`date '+%Y-%m-%d %H:%M:%S'`, { stdout: true }).trim()}"`,
+      // `date`,
+      ...timeZoneSteps,
+      ...chronySetUp(chronyConfPath),
+      ...keyboardSteps,
+    ]);
+  }
+
+  runSteps(
+    nfsHostPath,
+    cloudConfigFactory(
+      { IP_ADDRESS, architecture, host, nfsHostPath, ipaddr, update, gatewayip },
+      {
+        consumer_key,
+        consumer_token,
+        secret,
+      },
+    ),
+  );
+  installUbuntuUnderpostTools(nfsHostPath);
+};
+
 try {
   switch (operator) {
     case 'save':
@@ -1876,7 +1961,7 @@ EOF`);
 
           //   identity:
           //     hostname: rpi4
-          //     username: rpiadmin
+          //     username: root
           //     password: "{{PASSWORD}}"
 
           //   ssh:

package/cli.md

@@ -1,4 +1,4 @@
-## underpost ci/cd cli v2.8.814
+## underpost ci/cd cli v2.8.815
 
 ### Usage: `underpost [options] [command]`
   ```

package/docker-compose.yml

@@ -58,7 +58,7 @@ services:
           cpus: '0.25'
           memory: 20M
     labels: # labels in Compose file instead of Dockerfile
-      engine.version: '2.8.814'
+      engine.version: '2.8.815'
     networks:
       - load-balancer
 

package/manifests/deployment/dd-template-development/deployment.yaml

@@ -17,7 +17,7 @@ spec:
     spec:
       containers:
         - name: dd-template-development-blue
-          image: localhost/rockylinux9-underpost:v2.8.814
+          image: localhost/rockylinux9-underpost:v2.8.815
           #          resources:
           #            requests:
           #              memory: "124Ki"
@@ -100,7 +100,7 @@ spec:
     spec:
       containers:
         - name: dd-template-development-green
-          image: localhost/rockylinux9-underpost:v2.8.814
+          image: localhost/rockylinux9-underpost:v2.8.815
           #          resources:
           #            requests:
           #              memory: "124Ki"

package/package.json

@@ -2,7 +2,7 @@
     "type": "module",
     "main": "src/index.js",
     "name": "underpost",
-    "version": "2.8.814",
+    "version": "2.8.815",
     "description": "pwa api rest template",
     "scripts": {
         "start": "env-cmd -f .env.production node --max-old-space-size=8192 src/server",

package/src/index.js

@@ -32,7 +32,7 @@ class Underpost {
    * @type {String}
    * @memberof Underpost
    */
-  static version = 'v2.8.814';
+  static version = 'v2.8.815';
   /**
    * Repository cli API
    * @static