diff --git a/ansible/group_vars/all/websites.yml b/ansible/group_vars/all/websites.yml index bcf8f51d..0a9adac6 100644 --- a/ansible/group_vars/all/websites.yml +++ b/ansible/group_vars/all/websites.yml @@ -120,13 +120,6 @@ websites: - "www.savadaba.nl" state: "present" - - name: "sodi.{{ canonical_hostname }}" - alternative_names: - - "sodi.nl" - - "www.sodi.nl" - # You have to remove the task include of sodi.yml to remove this completely - state: "present" - - name: "static.{{ canonical_hostname }}" user: "static-sticky" alternative_names: [] @@ -247,7 +240,7 @@ websites: custom_config: true alternative_names: [] state: "present" - + - name: "committeeclash.{{ canonical_hostname }}" user: "committeeclash" custom_config: true diff --git a/ansible/main.yml b/ansible/main.yml index 61167d25..49e1576a 100644 --- a/ansible/main.yml +++ b/ansible/main.yml @@ -64,8 +64,6 @@ tags: "outline" - role: "radio" tags: "radio" - - role: "sodi" - tags: "sodi" - role: "public_files" tags: "public_files" - role: "mongoose" diff --git a/ansible/roles/backups/templates/backup-to-s3.sh.j2 b/ansible/roles/backups/templates/backup-to-s3.sh.j2 index 9e65690b..34f03663 100755 --- a/ansible/roles/backups/templates/backup-to-s3.sh.j2 +++ b/ansible/roles/backups/templates/backup-to-s3.sh.j2 @@ -79,12 +79,8 @@ case "${SOURCE}" in S3PATH="${SOURCE}" FILE_NAME="${FILE_TITLE}.tar.gz" - # SODI directories excluded because no other - # committee can write to these folders and they are deployed from \ - # git anyway. # Pretix's virtualenv is excluded as it only contains binaries. upload_backup_to_s3 < <(tar \ - --exclude='var/www/sodi.{{ canonical_hostname }}' \ --exclude='var/www/pretix/venv' \ -c -f - -C / var/www \ var/lib/crazy88bot/crazy88bot/data \ diff --git a/ansible/roles/harbor/templates/harbor.conf.j2 b/ansible/roles/harbor/templates/harbor.conf.j2 index aac58df9..48437953 100644 --- a/ansible/roles/harbor/templates/harbor.conf.j2 +++ b/ansible/roles/harbor/templates/harbor.conf.j2 @@ -1,3 +1,5 @@ +# {{ ansible_managed }} + server { listen 443 ssl; server_name harbor.{{ canonical_hostname }}; diff --git a/ansible/roles/sodi/tasks/main.yml b/ansible/roles/sodi/tasks/main.yml deleted file mode 100644 index a65ead47..00000000 --- a/ansible/roles/sodi/tasks/main.yml +++ /dev/null @@ -1,18 +0,0 @@ ---- -- name: "disable git safe directory feature for sodi folder" # noqa command-instead-of-module - ansible.builtin.command: "git config --global --add safe.directory /var/www/sodi.{{ canonical_hostname }}" - -- name: "clone sodi website from git" - ansible.builtin.git: - repo: "git@github.com:svsticky/sodi.nl.git" - dest: "/var/www/sodi.{{ canonical_hostname }}" - version: "master" - diff: false - -- name: "set permissions group on sodi files" - ansible.builtin.file: - path: "/var/www/sodi.{{ canonical_hostname }}" - owner: "www-data" - group: "www-data" - recurse: true - state: "directory" diff --git a/ansible/roles/studytrip/templates/studytrip.conf.j2 b/ansible/roles/studytrip/templates/studytrip.conf.j2 index 46babc67..a528fb9d 100644 --- a/ansible/roles/studytrip/templates/studytrip.conf.j2 +++ b/ansible/roles/studytrip/templates/studytrip.conf.j2 @@ -1,3 +1,5 @@ +# {{ ansible_managed }} + server { listen 443 ssl http2; listen [::]:443 ssl http2;