From 85c08d9d68d282a83c660aedb098a53ca362510d Mon Sep 17 00:00:00 2001 From: dimti Date: Tue, 4 Jun 2024 15:36:16 +0300 Subject: [PATCH] * true installation options for apt xsel * use pma user for generate basic auth password for phpmyadmin virtual host * include wp-cli playbook for apache site by default --- playbooks/apache-site.yml | 1 + playbooks/debops/yadm.yml | 2 +- playbooks/own/phpmyadmin-apache-auth.yml | 2 +- playbooks/own/phpmyadmin-nginx-auth.yml | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/playbooks/apache-site.yml b/playbooks/apache-site.yml index 3ae9438..4ec6168 100644 --- a/playbooks/apache-site.yml +++ b/playbooks/apache-site.yml @@ -13,6 +13,7 @@ - import_playbook: own/phpmyadmin-apache-auth.yml #- import_playbook: own/libgd3-fix-for-php81.yml # Need only for php8.1 #- import_playbook: own/correct-paths-for-pct-enter.yml +- import_playbook: own/wp-cli.yml # Import all other group playbooks in this file... diff --git a/playbooks/debops/yadm.yml b/playbooks/debops/yadm.yml index e45a159..9227f72 100644 --- a/playbooks/debops/yadm.yml +++ b/playbooks/debops/yadm.yml @@ -55,7 +55,7 @@ executable: /bin/bash - name: Xsel for working clipboard copy with X11 forwarding (use SSH -Y) - shell: apt install -t xsel -yy + shell: apt install -yy xsel roles: - role: keyring diff --git a/playbooks/own/phpmyadmin-apache-auth.yml b/playbooks/own/phpmyadmin-apache-auth.yml index eda0023..e3fab5d 100644 --- a/playbooks/own/phpmyadmin-apache-auth.yml +++ b/playbooks/own/phpmyadmin-apache-auth.yml @@ -15,7 +15,7 @@ - name: 'Adding pma apache auth passwords files' shell: |- - echo "{{ site_name }}:$(openssl passwd -apr1 {{ lookup("password", secret + "/basic/" + site_name + "/pma " + "length=30")}} )" > /etc/apache2/passwords.d/pma.passwords + echo "pma:$(openssl passwd -apr1 {{ lookup("password", secret + "/basic/" + site_name + "/pma " + "length=30")}} )" > /etc/apache2/passwords.d/pma.passwords - name: 'Change require all granted rule, because debops not present appropriate functional' shell: |- diff --git a/playbooks/own/phpmyadmin-nginx-auth.yml b/playbooks/own/phpmyadmin-nginx-auth.yml index f7bffa0..6e48f56 100644 --- a/playbooks/own/phpmyadmin-nginx-auth.yml +++ b/playbooks/own/phpmyadmin-nginx-auth.yml @@ -50,7 +50,7 @@ - name: 'Adding pma nginx auth passwords files' shell: |- - echo "{{ site_name }}:$(openssl passwd -apr1 {{ lookup("password", secret + "/basic/" + site_name + "/pma " + "length=30")}} )" > /etc/nginx/passwords.d/pma.passwords + echo "pma:$(openssl passwd -apr1 {{ lookup("password", secret + "/basic/" + site_name + "/pma " + "length=30")}} )" > /etc/nginx/passwords.d/pma.passwords - name: 'Turning on pma web site nginx config' shell: |-