chore: remove php role

svsticky · Nov 14, 2024 · 4b8bc3c · 4b8bc3c
1 parent 8ada398
commit 4b8bc3c
Show file tree

Hide file tree

Showing 11 changed files with 5 additions and 466 deletions.
diff --git a/ansible/group_vars/all/vars.yml b/ansible/group_vars/all/vars.yml
@@ -9,7 +9,7 @@ canonical_hostname: "{{ inventory_hostname }}"
 
 tmp_dir: "/tmp"
 
-# the upload limit for php-fpm and nginx in megabytes
+# the upload limit for nginx in megabytes
 upload_limit: 30
 
 slack_notifications:

diff --git a/ansible/group_vars/all/websites.yml b/ansible/group_vars/all/websites.yml
@@ -91,14 +91,6 @@ websites:
     state: "present"
     authenticated: true
 
-  - name: "phpmyadmin.{{ canonical_hostname }}"
-    user: "phpmyadmin"
-    alternative_names:
-      - "pma.{{ canonical_hostname }}"
-    # You have to remove the task include of phpmyadmin.yml to remove this
-    # completely
-    state: "absent"
-
   - name: "pretix.{{ canonical_hostname }}"
     custom_config: true
     alternative_names:

diff --git a/ansible/main.yml b/ansible/main.yml
@@ -30,8 +30,6 @@
       tags: "backups"
     - role: "nginx"
       tags: "nginx"
-    - role: "php"
-      tags: "php"
     - role: "node"
       tags: "node"
     - role: "certbot"
@@ -91,3 +89,4 @@
 # one can easily restore the role by reverting the following PRs:
 #
 # - execut: #475
+# - php: #474
diff --git a/ansible/roles/backups/templates/backup-to-s3.sh.j2 b/ansible/roles/backups/templates/backup-to-s3.sh.j2
@@ -79,12 +79,11 @@ case "${SOURCE}" in
           S3PATH="${SOURCE}"
           FILE_NAME="${FILE_TITLE}.tar.gz"
 
-          # phpMyAdmin and SODI directories excluded because no other
+          # 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/phpmyadmin.{{ canonical_hostname }}' \
             --exclude='var/www/sodi.{{ canonical_hostname }}' \
             --exclude='var/www/pretix/venv' \
             -c -f - -C / var/www \

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"
-    - "php-parameters.conf"
     - "security-headers.conf"
   notify: "reload nginx"
 

diff --git a/ansible/roles/nginx/templates/includes/php-parameters.conf.j2 b/ansible/roles/nginx/templates/includes/php-parameters.conf.j2
diff --git a/ansible/roles/nginx/templates/nginx.conf.j2 b/ansible/roles/nginx/templates/nginx.conf.j2
@@ -30,7 +30,8 @@ http {
   include /etc/nginx/mime.types;
   default_type application/octet-stream;
 
-  # Added this for phpMyAdmin
+  # Added this for phpMyAdmin.
+  # phpMyAdmin was removed but this line not, just to be sure
   server_names_hash_bucket_size 128;
 
   charset UTF-8;

diff --git a/ansible/roles/php/handlers/main.yml b/ansible/roles/php/handlers/main.yml
diff --git a/ansible/roles/php/tasks/main.yml b/ansible/roles/php/tasks/main.yml