roles/blog: fix updateBlog

- all tasks/* have been moved to their own roles in roles/*
- each file && template is now oragnized per-role
- annotated each task which still isn't idempotent !TODO!

.github/workflows/deploy.yaml

@@ -1,27 +1,27 @@
-name: Run Playbook
+# name: Run Playbook
 
-on:
-  push:
-    tags:
-      - "v*.*.*"
+# on:
+#   push:
+#     tags:
+#       - "v*.*.*"
 
-jobs:
-  deploy:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Set up Git repository
-        uses: actions/checkout@v3
-        with:
-          ssh-key: ${{ secrets.SSH_PRIVATE_KEY }}
-          submodules: recursive
-      - name: Run Ansible-Playbook
-        uses: dawidd6/action-ansible-playbook@v2
-        with:
-          playbook: run.yml
-          key: ${{ secrets.SSH_PRIVATE_KEY }}
-          inventory: |
-            [hosts]
-            openpunk-vps ansible_host=96.30.199.68 ansible_user=root ansible_connection=ssh
-          vault_password: ${{ secrets.VAULT_PASSWORD }}
-          options: |
-            --extra-vars domain=openpunk.com
+# jobs:
+#   deploy:
+#     runs-on: ubuntu-latest
+#     steps:
+#       - name: Set up Git repository
+#         uses: actions/checkout@v3
+#         with:
+#           ssh-key: ${{ secrets.SSH_PRIVATE_KEY }}
+#           submodules: recursive
+#       - name: Run Ansible-Playbook
+#         uses: dawidd6/action-ansible-playbook@v2
+#         with:
+#           playbook: run.yml
+#           key: ${{ secrets.SSH_PRIVATE_KEY }}
+#           inventory: |
+#             [hosts]
+#             openpunk-vps ansible_host=96.30.199.68 ansible_user=root ansible_connection=ssh
+#           vault_password: ${{ secrets.VAULT_PASSWORD }}
+#           options: |
+#             --extra-vars domain=openpunk.com

.vscode/settings.json

@@ -0,0 +1,5 @@
+{
+    "yaml.schemas": {
+        "https://raw.githubusercontent.com/ansible/ansible-lint/main/src/ansiblelint/schemas/ansible.json#/$defs/tasks": "file:///home/cpunch/projects/openpunk-ansible/roles/nginx/tasks/main.yml"
+    }
+}

README.md

@@ -1,12 +1,11 @@
 # OpenPunk's Ansible playbook
-<p align="center">
-    <a href="https://github.com/CPunch/openpunk-ansible/actions/workflows/deploy.yaml"><img src="https://github.com/CPunch/openpunk-ansible/actions/workflows/deploy.yaml/badge.svg?branch=main" alt="Workflow"></a>
-</p>
 
 This is my failsafe (and also my helpful migration tool) for restoring the OpenPunk server. This handles setting everything back up, including:
 
 - gitea
+    - sadly, no db migration is supported right now. maybe a future todo?
 - blog
+    - cron job for grabbing the `HEAD` of https://github.com/CPunch/openpunk && building the hugo site
 - tor mirror
 - nginx (for the above mentioned)
 - my shell theme (zsh + powerlevel10k)
@@ -14,12 +13,12 @@ This is my failsafe (and also my helpful migration tool) for restoring the OpenP
 
 This playbook assumes the target VPS is running the latest debian stable release.
 
-## Automatic deployment
-On new release tags the playbook is automatically ran on the production openpunk vps. For more info checkout the `.github/workflows/deploy.yaml` workflow
-
 ## Notes to my future self
 The deadswitch has the deadtrigger setup every run, so you have a 14-day timer to add a one-liner to your crontab to keep that deadtrigger set.
 
+Some DNS records also need to be set:
+- an A record with a `git.*` subdomain
+
 ## Usage
 ```sh
 ansible-playbook -i hosts --ask-vault-pass run.yml

group_vars/all.yml

@@ -1,2 +1,3 @@
 ---
-contact_email: openpunk@proton.me
+contact_email: openpunk@proton.me
+onionDomain: http://opnpnk6eutjiqy4ndpyvwxd5pncj2g2cmz6fkocr5uh3omnn4utvspad.onion

roles/blog/tasks/main.yml

@@ -4,17 +4,18 @@
     repo: "https://github.com/CPunch/openpunk.git"
     dest: "/var/www/{{ domain }}"
 
-- name: Build blog
-  command:
-    cmd: hugo
-    chdir: "/var/www/{{ domain }}"
-
 - name: Install updateBlog script
   template:
-    src: templates/blog/updateBlog
+    src: templates/updateBlog
     dest: /usr/local/bin/updateBlog
     mode: u+rx
 
+- name: Build blog
+  command:
+    cmd: updateBlog
+  register: blog_out
+  changed_when: blog_out.stdout != "up to date"
+
 # Rebuild blog every hour
 - name: Setup blog cron job
   cron:

roles/blog/templates/updateBlog

@@ -0,0 +1,32 @@
+#!/bin/bash
+cd /var/www/{{ domain }}
+
+PUBLIC_DIR=public
+TOR_DIR=tor
+
+buildBlog () {
+    hugo --cleanDestinationDir --minify -d $PUBLIC_DIR -b https://{{ domain }}
+    hugo --cleanDestinationDir --minify -d $TOR_DIR -b {{ onionDomain }}
+}
+
+git fetch origin
+UPSTREAM=${1:-'@{u}'}
+LOCAL=$(git rev-parse @)
+REMOTE=$(git rev-parse "$UPSTREAM")
+BASE=$(git merge-base @ "$UPSTREAM")
+if [ $LOCAL = $REMOTE ]; then
+    # this string is hardcoded && checked by the 'Build blog' task
+    # to check for changes (changed_when)
+    echo "up to date"
+elif [ $LOCAL = $BASE ]; then
+    # there are changes to reset too so we need to rebuild
+    echo "missing changes !!"
+    git reset --hard origin/main
+    buildBlog
+fi
+
+if [ ! -d "$PUBLIC_DIR" ] || [ ! -d "$TOR_DIR" ]; then
+    # probably first time setup
+    echo "missing directories !!"
+    buildBlog
+fi

roles/deadswitch/files/imdead.sh

@@ -16,3 +16,5 @@ sed -i 's/--DATE--/'$currDate'/g' $pageName
 git add .
 git commit -m "DeadSwitch: No response from CPunch in 14 days, posting dead.md"
 git push --force
+
+updateBlog

roles/deadswitch/tasks/main.yml

@@ -6,13 +6,13 @@
 
 - name: Install deadswitch script
   copy:
-    src: static/blog/deadswitch
+    src: deadswitch
     dest: /usr/local/bin/deadswitch
     mode: u+rx
 
 - name: Install imdead.sh
   copy:
-    src: static/blog/imdead.sh
+    src: imdead.sh
     dest: /root/deadman/imdead.sh
     mode: u+rx
 
@@ -22,6 +22,7 @@
     dest: /root/deadman/dead.patch
     mode: u+rw
 
+# TODO: make idempotent
 - name: Install deadtrigger
   file:
     name: /root/.deadtrigger

roles/essential/tasks/main.yml

@@ -1,7 +1,9 @@
 ---
+# TODO: make idempotent
 - name: Add Gitea repo key
   shell: curl -s https://packaging.gitlab.io/gitea/gpg.key | sudo gpg --no-default-keyring --keyring gnupg-ring:/etc/apt/trusted.gpg.d/morph027-gitea.gpg --import
 
+# TODO: make idempotent
 - name: Set key perms
   shell: sudo chmod 644 /etc/apt/trusted.gpg.d/morph027-gitea.gpg
 
@@ -30,6 +32,7 @@
       - zsh # :D
       - python3-certbot-nginx
 
+# TODO: make idempotent
 - name: Setup default shell (zsh)
   shell: chsh -s /usr/bin/zsh
 
@@ -41,6 +44,6 @@
 
 - name: Install .zshrc
   copy:
-    src: static/.zshrc
+    src: .zshrc
     dest: /root/.zshrc
     force: no

roles/firewall/tasks/main.yml

@@ -23,7 +23,7 @@
 
 - name: Copy fail2ban jail config
   copy:
-    src: static/fail2ban/jails.local
+    src: jails.local
     dest: /etc/fail2ban/jail.d/jails.local
 
 - name: Enable fail2ban service

roles/git/tasks/main.yml

@@ -1,7 +1,7 @@
 ---
 - name: Setup git config
   copy:
-    src: static/.gitconfig
+    src: .gitconfig
     dest: /root/.gitconfig
     owner: root
     mode: u=rw,g=,o=
@@ -9,6 +9,7 @@
 # make sure our vps trusts the github.com key signature. we pipe the output
 # of ssh-keyscan into .ssh/known_hosts
 
+# TODO: make idempotent
 - name: Scan for SSH host keys
   command: ssh-keyscan github.com 2>/dev/null
   register: ssh_scan

roles/gitea/tasks/main.yml

@@ -1,7 +1,7 @@
 ---
 - name: Configure Gitea
   template:
-    src: templates/gitea/app.ini
+    src: app.ini
     dest: /etc/gitea/app.ini
     owner: gitea
     force: no # we don't want to kill our existing config D:

roles/goaccess/tasks/main.yml

@@ -1,5 +1,5 @@
 ---
 - name: Copy goaccess config
   copy:
-    src: static/goaccess/goaccess.conf
+    src: goaccess.conf
     dest: /etc/goaccess/goaccess.conf

roles/nginx/files/nginx.conf

@@ -2,7 +2,7 @@ user www-data;
 worker_processes auto;
 include /etc/nginx/modules-enabled/*.conf;
 pid /run/nginx.pid;
-
+ 
 events {
     worker_connections 768;
 }

roles/nginx/handlers/main.yml

@@ -0,0 +1,4 @@
+---
+- name: setup-nginx
+  include_tasks: setup.yml
+  listen: "setup nginx"

roles/nginx/tasks/main.yml

@@ -0,0 +1,35 @@
+---
+- name: Install system nginx config
+  copy:
+    src: nginx.conf
+    dest: /etc/nginx/nginx.conf
+  notify: setup nginx
+
+# setup our configs for each host (we don't want to 
+# overwrite certbot's changes, so if it already exists,
+# don't copy!)
+
+- name: Install nginx config for {{ domain }}
+  template:
+    src: templates/site.conf
+    dest: /etc/nginx/conf.d/{{ domain }}.conf
+    force: no
+  notify: setup nginx
+
+- name: Install nginx config for git.{{ domain }}
+  template:
+    src: templates/gitea.conf
+    dest: /etc/nginx/conf.d/git.{{ domain }}.conf
+    force: no
+  notify: setup nginx
+
+- name: Install nginx config for our Hidden Service
+  template:
+    src: templates/tor.conf
+    dest: /etc/nginx/conf.d/tor-{{ domain }}.conf
+
+- name: Enable Nginx
+  systemd:
+    name: nginx
+    enabled: yes
+    state: started

roles/nginx/tasks/setup.yml

@@ -0,0 +1,9 @@
+---
+- name: Setup certbot
+  shell: "certbot --nginx --non-interactive --agree-tos -m {{ contact_email }} -d {{ domain }} -d git.{{ domain }}"
+
+- name: Reload Nginx
+  systemd:
+    name: nginx
+    enabled: yes
+    state: restarted

roles/nginx/templates/tor.conf

@@ -1,5 +1,5 @@
 server {
-    root /var/www/{{ domain }}/public;
+    root /var/www/{{ domain }}/tor;
     index index.html index.htm;
 
     location / {

roles/tor/tasks/main.yml

@@ -1,7 +1,7 @@
 ---
 - name: Install torrc
   template:
-    src: templates/tor/torrc
+    src: torrc
     dest: /etc/tor/torrc
     owner: root
     group: root
@@ -23,7 +23,7 @@
     group: debian-tor
     mode: u=rw,g=,o=
 
-- name: Reload Tor
+- name: Enable Tor Service
   systemd:
     name: tor
     enabled: yes

run.yml

@@ -9,13 +9,13 @@
       prompt: domain pointing to the vps
       private: no
 
-  tasks:
-    - import_tasks: tasks/essential.yml
-    - import_tasks: tasks/firewall.yml
-    - import_tasks: tasks/blog.yml
-    - import_tasks: tasks/gitea.yml
-    - import_tasks: tasks/tor.yml
-    - import_tasks: tasks/nginx.yml
-    - import_tasks: tasks/git.yml
-    - import_tasks: tasks/goaccess.yml
-    - import_tasks: tasks/deadswitch.yml
+  roles:
+    - essential
+    - git
+    - deadswitch
+    - firewall
+    - blog
+    - gitea
+    - nginx
+    - goaccess
+    - tor

tasks/nginx.yml

@@ -1,52 +0,0 @@
----
-- name: Remove default nginx config
-  file:
-    name: /etc/nginx/sites-enabled
-    state: absent
-
-- name: Restore sites-enabled
-  file:
-    name: /etc/nginx/sites-enabled
-    state: directory
-
-- name: Install system nginx config
-  copy:
-    src: static/nginx/nginx.conf
-    dest: /etc/nginx/nginx.conf
-
-# setup our configs for each host (we don't want to 
-# overwrite certbot's changes, so if it already exists,
-# don't copy!)
-
-- name: Install nginx config for {{ domain }}
-  template:
-    src: templates/nginx/site.conf
-    dest: /etc/nginx/conf.d/{{ domain }}.conf
-    force: no
-
-- name: Install nginx config for git.{{ domain }}
-  template:
-    src: templates/nginx/gitea.conf
-    dest: /etc/nginx/conf.d/git.{{ domain }}.conf
-    force: no
-
-- name: Install nginx config for our Hidden Service
-  template:
-    src: templates/nginx/tor.conf
-    dest: /etc/nginx/conf.d/tor-{{ domain }}.conf
-    force: no
-
-- name: Reload Nginx to install LetsEncrypt
-  service:
-    name: nginx
-    state: restarted
-
-# certbot is a life saver. thank you certbot devs!
-- name: Setup certbot
-  shell: "certbot --nginx --non-interactive --agree-tos -m {{ contact_email }} -d {{ domain }} -d git.{{ domain }}"
-
-- name: Reload Nginx with LetsEncrypt installed
-  systemd:
-    name: nginx
-    enabled: yes
-    state: restarted

templates/blog/updateBlog

@@ -1,5 +0,0 @@
-#!/bin/bash
-cd /var/www/{{ domain }}
-/usr/bin/git fetch origin
-/usr/bin/git reset --hard origin/main
-/usr/bin/hugo