From: Ludovic CHEVALIER <ludovic.chevalier@heureux-cyclage.org>
Date: Thu, 19 Mar 2015 17:09:31 +0000 (+0100)
Subject: Modifications : srv/ateliers/etc/nginx/dhparam.4096.pem
X-Git-Url: https://git.cyclocoop.org/%7B%7BLOCALURLE:Project:Shrnut%C3%83%C2%AD%20editace%7D%7D?a=commitdiff_plain;h=0ac808786df9dc70d5a89c82d235ec8347e2261c;p=lhc%2Fadmin.git

Modifications : srv/ateliers/etc/nginx/dhparam.4096.pem
---

diff --git a/sec b/sec
index a22bee6..a304fdd 160000
--- a/sec
+++ b/sec
@@ -1 +1 @@
-Subproject commit a22bee61696e3cc4ad935d2f8b1680c966c7fd4d
+Subproject commit a304fdd53ee71d7a1ed1555694a5201858a3b38d
diff --git a/srv/ateliers/etc/nginx/conf.d/ssl-pfs.conf b/srv/ateliers/etc/nginx/conf.d/ssl-pfs.conf
index 28a4499..c097ac4 100644
--- a/srv/ateliers/etc/nginx/conf.d/ssl-pfs.conf
+++ b/srv/ateliers/etc/nginx/conf.d/ssl-pfs.conf
@@ -13,7 +13,7 @@ ssl_prefer_server_ciphers on;
 ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
 ssl_session_cache shared:SSL:10m;
 ssl_session_timeout 10m;
-ssl_stapling on;
-ssl_stapling_verify on;
+#ssl_stapling on;
+#ssl_stapling_verify on;
 
 # vim: ft=sh
diff --git a/srv/ateliers/etc/nginx/dhparam.4096.pem b/srv/ateliers/etc/nginx/dhparam.4096.pem
new file mode 120000
index 0000000..359b4ea
--- /dev/null
+++ b/srv/ateliers/etc/nginx/dhparam.4096.pem
@@ -0,0 +1 @@
+.../var/x509/dhparam.4096.pem
\ No newline at end of file
diff --git a/srv/ateliers/etc/nginx/org/heureux-cyclage/dhparam.4096.pem b/srv/ateliers/etc/nginx/org/heureux-cyclage/dhparam.4096.pem
deleted file mode 120000
index 2312b2f..0000000
--- a/srv/ateliers/etc/nginx/org/heureux-cyclage/dhparam.4096.pem
+++ /dev/null
@@ -1 +0,0 @@
-.../var/x509/org/heureux-cyclage/dhparam.4096.pem
\ No newline at end of file
diff --git a/srv/ateliers/etc/nginx/org/heureux-cyclage/install b/srv/ateliers/etc/nginx/org/heureux-cyclage/install
old mode 100644
new mode 100755
index 2dd49b2..97a4a5a
--- a/srv/ateliers/etc/nginx/org/heureux-cyclage/install
+++ b/srv/ateliers/etc/nginx/org/heureux-cyclage/install
@@ -5,10 +5,14 @@
 # ACTION: initialize from ./
 	test -L "$0" && tool="$(readlink -e "$0")" || tool=$0
 	tool=$(readlink -e "${tool%/*}"/...)
-	. "$tool"/lib/install.sh
+	. "$tool"/lib/tool/admin/lib/install.sh
 # ACTION install ./etc/nginx/org/heureux-cyclage/
 	content=$("$tool"/cat etc/nginx/org/heureux-cyclage/key.pem)
-	"$tool"/ssh-sudo install -m 400 -o root -g root /dev/stdin \
+	"$tool"/ssh-sudo install -d -m 755 -o root -g root \
+	 /etc/nginx/org \
+	 /etc/nginx/org/heureux-cyclage \
+	 "&&" \
+	$sudo install -m 400 -o root -g root /dev/stdin \
 	 /etc/nginx/org/heureux-cyclage/key.pem <<-EOF
 		$content
 		EOF