From e5bd6e193791afe2ac244707065de376765393cb Mon Sep 17 00:00:00 2001
From: Andrea Dell'Amico <andrea.dellamico@isti.cnr.it>
Date: Fri, 19 Mar 2021 18:24:56 +0100
Subject: [PATCH] Il socket PHP usava le variabili sbagliate.

---
 group_vars/all/all.yml | 4 +---
 run.sh                 | 8 +++++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/group_vars/all/all.yml b/group_vars/all/all.yml
index 118d7cf..163f121 100644
--- a/group_vars/all/all.yml
+++ b/group_vars/all/all.yml
@@ -76,12 +76,10 @@ php_app_nginx_virthost:
     proxy_standard_setup: True
     locations:
       - location: ~ \.php$
-        php_target: '{{ phpfpm_listen_host }}:{{ phpfpm_listen_port }}'
+        php_target: '{{ phpfpm_default_listen }}'
 
 phpfpm_default_user: '{{ php_app_user }}'
 phpfpm_default_pool_name: php_app
-http_port: 80
-https_port: 443
 
 php_version: 7.4
 
diff --git a/run.sh b/run.sh
index b3ce64b..fec7c41 100755
--- a/run.sh
+++ b/run.sh
@@ -70,12 +70,14 @@ fi
 if [ -d ./host_vars ] ; then
     VAULT_HOST_FILES=$( find ./host_vars -name \*vault\* )
 fi
- 
+#
+# Insert your vault password file here if you don't want to be asked for it
+VAULT_PASS_FILE=
 if [ -n "$VAULT_GROUP_FILES" ] || [ -n "$VAULT_HOST_FILES" ] ; then
     # Vault requires a password.
     # To encrypt a password for a user: python -c "from passlib.hash import sha512_crypt; print sha512_crypt.encrypt('<password>')"
-    if [ -f ~/.redbox_ansible_vault_pass.txt ] ; then
-        PLAY_OPTS="$PLAY_OPTS --vault-password-file=~/.redbox_ansible_vault_pass.txt"
+    if [ -n "$VAULT_PASS_FILE" ] && [ -f "$VAULT_PASS_FILE" ] ; then
+        PLAY_OPTS="$PLAY_OPTS --vault-password-file=~/$VAULT_PASS_FILE"
     else
         echo "There are password protected encrypted files, we will ask for password before proceeding"
         PLAY_OPTS="$PLAY_OPTS --ask-vault-pass"