Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
servers-config
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Gruppo Sistemisti
servers-config
Commits
e8093422
Commit
e8093422
authored
Mar 15, 2018
by
Mattia Rizzolo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
nginx: drop duplicate directives
Signed-off-by:
Mattia Rizzolo
<
mattia@debian.org
>
parent
3705c7e8
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
4 deletions
+6
-4
deploy
deploy
+4
-2
roles/nginx/templates/conf.d/misc.conf
roles/nginx/templates/conf.d/misc.conf
+2
-2
No files found.
deploy
View file @
e8093422
...
@@ -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
\
$@
roles/nginx/templates/conf.d/misc.conf
View file @
e8093422
...
@@ -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
:
5
m
;
ssl_session_cache
shared
:
SSL
:
5
m
;
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
;
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment