chore: remove execute role

svsticky · Nov 5, 2024 · b9f7b0e · b9f7b0e
1 parent d7f4727
commit b9f7b0e
Show file tree

Hide file tree

Showing 13 changed files with 9 additions and 358 deletions.
diff --git a/ansible/group_vars/all/websites.yml b/ansible/group_vars/all/websites.yml
@@ -183,91 +183,6 @@ websites:
     authenticated: true
     state: "present"
 
-  - name: "execut-speakers.{{ canonical_hostname }}"
-    user: "symposium"
-    alternative_names: []
-    extra_includes:
-      - "execut-referer-tracking"
-    state: "present"
-
-  - name: "execut-partners.{{ canonical_hostname }}"
-    user: "symposium"
-    alternative_names: []
-    extra_includes:
-      - "execut-referer-tracking"
-    state: "absent"
-
-  - name: "execut-survey.{{ canonical_hostname }}"
-    user: "symposium"
-    alternative_names: []
-    extra_includes:
-      - "execut-referer-tracking"
-    state: "present"
-
-  - name: "execut-landing.{{ canonical_hostname }}"
-    user: "symposium"
-    alternative_names: []
-    extra_includes:
-     - "execut-referer-tracking"
-    state: "present"
-
-  - name: "execut-2018.{{ canonical_hostname }}"
-    user: "symposium"
-    alternative_names: []
-    extra_includes:
-      - "execut-referer-tracking"
-    state: "present"
-
-  - name: "execut-2019.{{ canonical_hostname }}"
-    user: "symposium"
-    alternative_names: []
-    extra_includes:
-      - "execut-referer-tracking"
-    state: "present"
-
-  - name: "execut-2020.{{ canonical_hostname }}"
-    user: "symposium"
-    alternative_names: []
-    extra_includes:
-      - "execut-referer-tracking"
-    state: "present"
-
-  - name: "execut-2023.{{ canonical_hostname }}"
-    user: "symposium"
-    alternative_names: []
-    extra_includes:
-      - "execut-referer-tracking"
-    custom_config: true
-    state: "present"
-
-  - name: "execut-aftermovie.{{ canonical_hostname }}"
-    user: "symposium"
-    alternative_names: []
-    extra_includes:
-      - "execut-referer-tracking"
-    state: "present"
-
-  - name: "execut-app.{{ canonical_hostname }}"
-    user: "symposium"
-    alternative_names: []
-    extra_includes:
-      - "execut-referer-tracking"
-    state: "absent"
-
-  - name: "execut-2021.{{ canonical_hostname }}"
-    user: "symposium"
-    alternative_names: []
-    extra_includes: []
-    custom_config: true
-    state: "present"
-
-  - name: "execut.{{ canonical_hostname }}"
-    user: "symposium"
-    alternative_names: []
-    extra_includes: []
-    custom_config: true
-    state: "present"
-
   - name: "snic-preview.{{ canonical_hostname }}"
     user: "snic"
     alternative_names: []
@@ -286,16 +201,6 @@ websites:
     alternative_names: []
     state: "present"
 
-  - name: "execut-feedback.{{ canonical_hostname }}"
-    user: "symposium"
-    alternative_names: []
-    state: "present"
-
-  - name: "execut-qa.{{ canonical_hostname }}"
-    user: "symposium"
-    alternative_names: []
-    state: "present"
-
   - name: "files.{{ canonical_hostname }}"
     user: "bestuur"
     custom_config: true

diff --git a/ansible/group_vars/production/vars.yml b/ansible/group_vars/production/vars.yml
@@ -57,13 +57,6 @@ secret_backup_aws:
   access_key: "{{ vault_secret_backup_aws.access_key }}"
   secret_key: "{{ vault_secret_backup_aws.secret_key }}"
 
-secret_execut_website_aws:
-  access_key: "{{ vault_secret_execut_website_aws.access_key }}"
-  secret_key: "{{ vault_secret_execut_website_aws.secret_key }}"
-
-secret_execut_website_secretkey:
-  "{{ vault_secret_execut_website_secretkey }}"
-
 # To change, regenerate the token in Mollie's web interface.
 secret_mollie_token: "{{ vault_secret_mollie_token }}"
 

diff --git a/ansible/group_vars/staging/vars.yml b/ansible/group_vars/staging/vars.yml
@@ -49,12 +49,6 @@ secret_backup_aws:
   access_key: "{{ vault_secret_backup_aws.access_key }}"
   secret_key: "{{ vault_secret_backup_aws.secret_key }}"
 
-secret_execut_website_aws:
-  access_key: "{{ vault_secret_execut_website_aws.access_key }}"
-  secret_key: "{{ vault_secret_execut_website_aws.secret_key }}"
-
-secret_execut_website_secretkey: "{{ vault_secret_execut_website_secretkey }}"
-
 # To change, regenerate the token in Mollie's web interface.
 secret_mollie_token: "{{ vault_secret_mollie_token }}"
 
@@ -158,7 +152,7 @@ secret_chroma:
 
 fallacious_rooster:
   git_tag: "0.1.4"
-  
+
 digidecs:
   git_tag: "0.1.0"
-  server_port: 65437
+  server_port: 65437
diff --git a/ansible/main.yml b/ansible/main.yml
@@ -62,8 +62,6 @@
       tags: "oauth"
     - role: "outline"
       tags: "outline"
-    - role: "execut"
-      tags: "execut"
     - role: "radio"
       tags: "radio"
     - role: "sodi"
@@ -87,3 +85,9 @@
       tags: "always"
     - role: "rooster"
       tags: "rooster"
+
+# Following is a list of removed roles, which we did have.
+# If, for some reason, we ever want to use on of the removed services again,
+# one can easily restore the role by reverting the following PRs:
+#
+# - execut: #478
diff --git a/ansible/roles/execut/tasks/main.yml b/ansible/roles/execut/tasks/main.yml
diff --git a/ansible/roles/execut/templates/execut.service.j2 b/ansible/roles/execut/templates/execut.service.j2
diff --git a/ansible/roles/execut/templates/execut_www.env.j2 b/ansible/roles/execut/templates/execut_www.env.j2
diff --git a/ansible/roles/execut/templates/nginx.conf.j2 b/ansible/roles/execut/templates/nginx.conf.j2
diff --git a/ansible/roles/nginx/tasks/main.yml b/ansible/roles/nginx/tasks/main.yml
@@ -29,7 +29,6 @@
     dest: "/etc/nginx/includes/{{ item }}"
   loop:
     - "block-cert-validation-path.conf"
-    - "execut-referer-tracking.conf"
     - "php-parameters.conf"
     - "security-headers.conf"
   notify: "reload nginx"