Merge remote-tracking branch 'refs/remotes/origin/main'

.gitea/workflows/hatarashi-hako.yaml

@@ -1,31 +1,39 @@
-name: Ansible Deploy
+name: Ansible Deploy
-
+
-on:
+on:
-  push:
+  push:
-
+  schedule:
-jobs:
+    - cron: '00 23 * * *' 
-  deploy:
+
-    runs-on: ubuntu-latest
+jobs:
-
+  deploy:
-    steps:
+    runs-on: ubuntu-latest
-    - name: Checkout Repository
+
-      uses: actions/checkout@v3
+    steps:
-
+    - name: Checkout Repository
-    - name: Set up Python
+      uses: actions/checkout@v3
-      run: |
+
-        apt -y update 
+    - name: Set up Python
-        apt -y install python3 python3-pip skopeo
+      run: |
-
+        apt -y update 
-    - name: Install Ansible
+        apt -y install python3 python3-pip skopeo
-      run: |
+
-        python3 -m pip install --upgrade pip
+    - name: Install Ansible
-        pip install ansible        
+      run: |
-
+        python3 -m pip install --upgrade pip
-    - name: Set up SSH
+        pip install ansible        
-      uses: webfactory/ssh-agent@v0.5.0
+
-      with:
+    - name: Set up SSH
-        ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }}
+      uses: webfactory/ssh-agent@v0.5.0
-    
+      with:
-    - name: Run Ansible Playbook
+        ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }}
-      run: |
+    
-          ansible-playbook -i inventory.yaml -e 'ANSIBLE_SUDO_PASS="${{ secrets.SUDO_PASS }}" SKOPEO_PASS="${{ secrets.SKOPEO_PASS }}"' hatarashi-hako.yaml -vv  
+    - name: Checkout Ansible inventory
+      run: |
+        INVENTORY_URL="https://shmick:${{ secrets.ANSIBLE_TOKEN }}@git.pukeko.xyz/shmick/ansible/raw/branch/main/inventory.yaml"
+        curl -o inventory.yaml $INVENTORY_URL
+        cat inventory.yaml
+    
+    - name: Run Ansible Playbook
+      run: |
+          ansible-playbook -i inventory.yaml -e 'ANSIBLE_SUDO_PASS="${{ secrets.SUDO_PASS }}" SKOPEO_PASS="${{ secrets.SKOPEO_PASS }}"' hatarashi-hako.yaml -vv  

hatarashi-hako.sh

@@ -141,3 +141,10 @@ for container_path in ${CONTAINER_PATHS[@]}; do
 	cd $LOCAL_DIR
 done
 echo "All done!"
+
+## Once the script finishes, the .prom file will live on for 5 minutes before being deleted.
+#+ This allows Prometheus to pick up the alert, send out a notification, and move on with its life.
+(
+        sleep 300
+        rm $PROM_FILE
+) 2>1 >/dev/null &

hatarashi-hako.yaml

@@ -6,7 +6,7 @@
     ansible_sudo_pass: "{{ ANSIBLE_SUDO_PASS }}"
 
   tasks:
-    - name: Install Skopeo
+    - name: Install Dependencies
       ansible.builtin.package:
         name: skopeo
         state: latest

inventory.yaml

@@ -1,5 +0,0 @@
-all:
-  hosts:
-    takahe:
-      ansible_host: 192.168.0.66
-      ansible_user: shmick