Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: remove php role #474

Merged
merged 1 commit into from
Nov 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ansible/group_vars/all/vars.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
8 changes: 0 additions & 8 deletions ansible/group_vars/all/websites.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
3 changes: 1 addition & 2 deletions ansible/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,6 @@
tags: "backups"
- role: "nginx"
tags: "nginx"
- role: "php"
tags: "php"
- role: "node"
tags: "node"
- role: "certbot"
Expand Down Expand Up @@ -91,3 +89,4 @@
# one can easily restore the role by reverting the following PRs:
#
# - execut: #475
# - php: #474
3 changes: 1 addition & 2 deletions ansible/roles/backups/templates/backup-to-s3.sh.j2
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
1 change: 0 additions & 1 deletion ansible/roles/nginx/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
dest: "/etc/nginx/includes/{{ item }}"
loop:
- "block-cert-validation-path.conf"
- "php-parameters.conf"
- "security-headers.conf"
notify: "reload nginx"

Expand Down
35 changes: 0 additions & 35 deletions ansible/roles/nginx/templates/includes/php-parameters.conf.j2

This file was deleted.

3 changes: 2 additions & 1 deletion ansible/roles/nginx/templates/nginx.conf.j2
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 0 additions & 6 deletions ansible/roles/php/handlers/main.yml

This file was deleted.

39 changes: 0 additions & 39 deletions ansible/roles/php/tasks/main.yml

This file was deleted.

Loading
Loading