diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..0e7db31 --- /dev/null +++ b/.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" + } +} \ No newline at end of file diff --git a/group_vars/all.yml b/group_vars/all.yml index 02e040a..4298398 100644 --- a/group_vars/all.yml +++ b/group_vars/all.yml @@ -1,2 +1,3 @@ --- -contact_email: openpunk@proton.me \ No newline at end of file +contact_email: openpunk@proton.me +onionDomain: http://opnpnk6eutjiqy4ndpyvwxd5pncj2g2cmz6fkocr5uh3omnn4utvspad.onion \ No newline at end of file diff --git a/roles/blog/tasks/main.yml b/roles/blog/tasks/main.yml index 9f29ed5..27da79f 100644 --- a/roles/blog/tasks/main.yml +++ b/roles/blog/tasks/main.yml @@ -4,7 +4,7 @@ repo: "https://github.com/CPunch/openpunk.git" dest: "/var/www/{{ domain }}" -# TODO: make idempotent +# TODO: make idempotent (call the updateBlog script !!) - name: Build blog command: cmd: hugo diff --git a/roles/blog/templates/updateBlog b/roles/blog/templates/updateBlog index a09fef8..e270b34 100644 --- a/roles/blog/templates/updateBlog +++ b/roles/blog/templates/updateBlog @@ -2,4 +2,7 @@ cd /var/www/{{ domain }} /usr/bin/git fetch origin /usr/bin/git reset --hard origin/main -/usr/bin/hugo \ No newline at end of file + +# build sites +/usr/bin/hugo --cleanDestinationDir --minify -d public -b https://{{ domain }} +/usr/bin/hugo --cleanDestinationDir --minify -d tor -b {{ onionDomain }} diff --git a/roles/deadswitch/files/imdead.sh b/roles/deadswitch/files/imdead.sh index 1f623b2..b5ac208 100644 --- a/roles/deadswitch/files/imdead.sh +++ b/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 \ No newline at end of file diff --git a/roles/nginx/tasks/main.yml b/roles/nginx/tasks/main.yml index 8e12204..ac7a85e 100644 --- a/roles/nginx/tasks/main.yml +++ b/roles/nginx/tasks/main.yml @@ -27,8 +27,6 @@ template: src: templates/tor.conf dest: /etc/nginx/conf.d/tor-{{ domain }}.conf - force: no - notify: setup nginx - name: Enable Nginx systemd: diff --git a/roles/nginx/templates/tor.conf b/roles/nginx/templates/tor.conf index 2ec0dc2..0b6e67a 100644 --- a/roles/nginx/templates/tor.conf +++ b/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 / {