Update cluster installation scripts

bastion.tf

@@ -19,21 +19,21 @@ resource "digitalocean_record" "bastion" {
     type   = "A"
     name   = "sh"
     value  = digitalocean_droplet.bastion.ipv4_address
-    ttl    = 1800
+    ttl    = 30
 }
 
 resource "digitalocean_record" "cockpit" {
     domain = data.digitalocean_domain.mapesa.name
     type   = "A"
-    name   = "cockpit"
+    name   = "cockpit-stg"
     value  = digitalocean_droplet.bastion.ipv4_address
-    ttl    = 1800
+    ttl    = 30
 }
 
 resource "digitalocean_record" "nginx-ui" {
     domain = data.digitalocean_domain.mapesa.name
     type   = "A"
-    name   = "nginx"
+    name   = "nginx-stg"
     value  = digitalocean_droplet.bastion.ipv4_address
-    ttl    = 1800
+    ttl    = 30
 }

cloud-init/centos-user-data.yaml

@@ -7,7 +7,7 @@ users:
       shell: /bin/bash
       ssh_pwauth: True
       ssh_authorized_keys:
-        - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC99ASMMWsWlM+rU3c6UoU6BvlJr67X86WzFmFF//IeBWH1lv1Dccm3I7jYR7Pklr1M21cHdeoMakhPhH1xd/1Njj8DeFa/tJkpLiFc84qyIfensvXOhKJImpsRr0vvPruAUfm+RRtShLfDLqf42s6hSR5FWTTST4js/9CSEbrmEaCwDOfUVIlQuWmzaWL/tYF1HS6Z/FppAeswnXkDVsPUkXIMyKj5Bpgk5fbNgYoqK1t3iJehMM9dWAfGoD9ig1DiegnOUkN51DjCFEPQtdGcfaliv7M82soO1DVqTK7DZYyXU3Wmb82sy2GpDRWT0q9lJiaw8HHH805M2LzJ4Fty+Tc3b4l6QQCC8qhvgrzGBjbfbpYy3/yvgzfIMfeouDn9fXRmLCWfchRZIu9vcWCAsW6zzGyae2zlrzH/TLCd2BsWLmh3Rysu3hPzJTY8mvmal0Q2ZIxbtKOA5O5ZkYtHEfOo+s/5kD6Np9wOdKZDHOIhJRBk2TO7UgnRfA/jlA6pqYHA7/Q2348L/5KGQzn4o3DvKC03tFGUo4pc9mdSAOpPOi+e5vCi5tUPnSI34guw9K7DJ0waYDB7rTe+QxXi3lm6Lvu0qYB9QqACzEWyTzO18gjOhUU2lKBpV84oPeXD237mo7zvb7K4BBReHnLBrnDSoLlmlJxXUx5a3vOFfQ== collin@solublecode.dev
+        - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDg0aL7mFY1FjRlVvFOQVH0TsoLxrt75eu7sl/g9YvyYzYk3I9GSh/pogGwI7pXNfxgUgRe+GXONol8axsnFpdXzRHHEdA921ejm2nnsOFpp9ZH00P/IFEZbk0/6qj+WiEHFLHc7XM94Myq5rdaWoR+MVQSVAbJNcALGU0yYmp35MYBEdxCLmOmSrf9HsOmHRdmbJLrM8LDdrsHj3JJWVsw6+ZWh4YuuiVp3H288GEnKBWi6mpNs8Y+0HLLYfxuwAeJpfN4Nn6XF8gjfvQBZy0WGuFzeHBQkUkhLz1fHddK3bg5Pz2d98FyRxVwjrKBfidy6hUejepsZeCmgP5rWFbIDMTFPry5gAWfMS3VkOGUx+hPqtqpzjW9M9VHYNCZ12RSNl9+cuQs/QToEV5FcHu6homuW8WVbxjySaRvAI7zvB9NTSvx4yXeFfPFvpPLOjG+omr4uY5GwNDETbUTtCmODgwpg8JoRAHAXI8jhRN3LirqZMRk29sGkFhCdXuSgwIdCpLuTJiaX8LI8al41vpSP9Garcad87uZ+Y7fzswpfK7RXgnCfUWTrWI/PhdDBKqxxVA2F1kxp0mqTq8FDJtDRZQ+mQn1hU2vQ3zOt858j8JRlBOns7AQ0XLX49V5dWR4F6PHLdPnPGkkTeLiYBrSxyMc3/ltWDAstnSBPiwCcw== collin@solublecode.dev
 chpasswd:
   list: |
      groot:groot
@@ -37,8 +37,8 @@ write_files:
       permissions: '0700'
       content: |
         #! /bin/bash
-        certbot-auto --nginx -n --email collin@solublecode.dev --agree-tos -d cockpit.solublecode.dev
-        certbot-auto --nginx -n --email collin@solublecode.dev --agree-tos -d nginx.solublecode.dev
+        certbot-auto --nginx -n --email collin@solublecode.dev --agree-tos -d cockpit-stg.solublecode.dev
+        certbot-auto --nginx -n --email collin@solublecode.dev --agree-tos -d nginx-stg.solublecode.dev
         dnf -y install firewalld
         systemctl enable --now firewalld
         firewall-cmd --permanent --zone=public --add-service=cockpit
@@ -53,14 +53,14 @@ write_files:
     - path: /etc/cockpit/cockpit.conf
       content: |
         [WebService]
-        Origins = https://cockpit.solublecode.dev wss://cockpit.solublecode.dev
+        Origins = https://cockpit-stg.solublecode.dev wss://cockpit-stg.solublecode.dev
         ProtocolHeader = X-Forwarded-Proto
-    - path: /etc/nginx/conf.d/nginx.solublecode.dev.conf
+    - path: /etc/nginx/conf.d/nginx-stg.solublecode.dev.conf
       content: |
         server {
             listen         80;
             listen         443 ssl;
-            server_name    nginx.solublecode.dev;
+            server_name    nginx-stg.solublecode.dev;
 
             location / {
                 proxy_pass http://127.0.0.1:8080/;
@@ -70,12 +70,12 @@ write_files:
             auth_basic_user_file /opt/nginx-ui/.htpasswd;
 
         }
-    - path: /etc/nginx/conf.d/cockpit.solublecode.dev.conf
+    - path: /etc/nginx/conf.d/cockpit-stg.solublecode.dev.conf
       content: |
         server {
             listen         80;
             listen         443 ssl;
-            server_name    cockpit.solublecode.dev;
+            server_name    cockpit-stg.solublecode.dev;
 
             location / {
                 # Required to proxy the connection to Cockpit

cloud-init/fedora-user-data.yaml

@@ -7,6 +7,4 @@ runcmd:
     - dnf -y install docker-ce java-11-openjdk.x86_64
     - groupadd docker
     - usermod -aG docker $USER
-    - systemctl enable --now docker
-bootcmd:
-    - ifdown eth0
+    - systemctl enable --now docker

cloud-init/ubuntu-user-data.yaml

@@ -2,10 +2,6 @@
 package_update: true
 package_upgrade: true
 packages:
-    - unzip
     - net-tools
     - docker.io
-    - openjdk-14-jre-headless
-bootcmd:
-    - ifdown eth0
-
+    - openjdk-14-jre-headless