Commit e8093422 authored by Mattia Rizzolo's avatar Mattia Rizzolo

nginx: drop duplicate directives

Signed-off-by: Mattia Rizzolo's avatarMattia Rizzolo <mattia@debian.org>
parent 3705c7e8
...@@ -20,9 +20,10 @@ usage() { ...@@ -20,9 +20,10 @@ usage() {
# Load arguments from CLI # Load arguments from CLI
if [[ $# -ne 2 ]]; then usage; fi if [[ $# -lt 2 ]]; then usage; fi
environment="$1" environment="$1"
playbook="$2" playbook="$2"
shift 2
env="${DIR_ENVIRONMENTS}/${environment}" env="${DIR_ENVIRONMENTS}/${environment}"
playbook_file="${DIR_PLAYBOOKS}/${playbook}.yml" playbook_file="${DIR_PLAYBOOKS}/${playbook}.yml"
...@@ -69,4 +70,5 @@ ln -s "`readlink -e "${env}"`" "${DIR_TEMP}/env" ...@@ -69,4 +70,5 @@ ln -s "`readlink -e "${env}"`" "${DIR_TEMP}/env"
# Finally execute the playbook against the server # Finally execute the playbook against the server
"${BIN_ANSIBLE_PLAYBOOK}" -i "${DIR_TEMP}/env/hosts" \ "${BIN_ANSIBLE_PLAYBOOK}" -i "${DIR_TEMP}/env/hosts" \
"${DIR_TEMP}/play/playbook.yml" \ "${DIR_TEMP}/play/playbook.yml" \
-vv --diff -vv --diff \
$@
...@@ -10,7 +10,7 @@ add_header Referrer-Policy "strict-origin-when-cross-origin"; ...@@ -10,7 +10,7 @@ add_header Referrer-Policy "strict-origin-when-cross-origin";
# shared ssl settings # shared ssl settings
ssl_session_cache shared:SSL:5m; ssl_session_cache shared:SSL:5m;
ssl_protocols TLSv1 TLSv1.1 TLSv1.2; #ssl_protocols TLSv1 TLSv1.1 TLSv1.2; # already in nginx.conf
ssl_ciphers HIGH:!aNULL:!eNULL:!EXP:!LOW:!MD5; ssl_ciphers HIGH:!aNULL:!eNULL:!EXP:!LOW:!MD5;
ssl_prefer_server_ciphers on; #ssl_prefer_server_ciphers on; # already in nginx.conf
ssl_dhparam dhparams.pem; ssl_dhparam dhparams.pem;
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment