From 319bb24d14756052b4d0cfc7f5a15bcf21f673e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Szekeres=20Ba=CC=81lint?= <szekeres.balint@hps.hu>
Date: Sun, 2 Dec 2018 17:13:48 +0100
Subject: [PATCH] sed commands for SSL directives disable/enable
---
public/templates/commands.html | 21 ++++++++++++++++++---
1 file changed, 18 insertions(+), 3 deletions(-)
diff --git a/public/templates/commands.html b/public/templates/commands.html
index 4f4a2b3..2b14a0e 100644
--- a/public/templates/commands.html
+++ b/public/templates/commands.html
@@ -20,10 +20,17 @@
✔ Let's Encrypt --><span ng-if="isCertLetsEncrypt()"><!--
---><span class="hljs-comment"># <strong>HTTPS</strong>: create ACME-challenge common directory</span>
+--><span class="hljs-comment"># <strong>HTTPS - certbot</strong> (before first run): create ACME-challenge common directory</span>
<span class="hljs-section">sudo</span> <span class="hljs-attribute">-u</span> {{ data.user }} <span class="hljs-section">sh</span> <span class="hljs-attribute">-c</span> "<span class="hljs-section">mkdir</span> <span class="hljs-attribute">-p</span> /var/www/_letsencrypt"
-<span class="hljs-comment"># <strong>HTTPS</strong>: certbot (obtain certificates)<br># disable before first run: <strong>listen</strong>, <strong>ssl_certificate</strong>, <strong>ssl_certificate_key</strong>, <strong>ssl_trusted_certificate</strong> in HTTPS server</span>
+<span class="hljs-comment"># <strong>HTTPS - certbot</strong> (before first run): disable SSL directives</span>
+<span class="hljs-section">sed</span> <!--
+--><span class="hljs-attribute">-i</span> <!--
+--><span class="hljs-attribute">-r</span> <!--
+-->'s/listen (.*)443/listen \1443;#/g; s/ssl_(certificate|certificate_key|trusted_certificate) /#;#ssl_\1/g' <!--
+-->/etc/nginx/sites-{{ isSymlink() ? 'available' : 'enabled' }}/{{ domain() }}.conf
+
+<span class="hljs-comment"># <strong>HTTPS - certbot</strong>: obtain certificates</span>
<span class="hljs-section">certbot certonly</span> <!--
--><span class="hljs-attribute">--webroot</span> <!--
--><span ng-if="isNonWWW() || isRedirect()"><span class="hljs-attribute" tooltips tooltip-template="--domain">-d</span> {{ domain() }} </span><!--
@@ -33,6 +40,14 @@
--><span class="hljs-attribute" tooltips tooltip-template="--webroot-path">-w</span> /var/www/_letsencrypt <!--
--><span class="hljs-attribute" tooltips tooltip-template="--non-interactive">-n</span> <!--
--><span class="hljs-attribute">--agree-tos</span> <!--
---><span class="hljs-attribute">--force-renewal</span><!--
+--><span class="hljs-attribute">--force-renewal</span>
+
+<span class="hljs-comment"># <strong>HTTPS - certbot</strong> (after first run): enable SSL directives</span>
+<span class="hljs-section">sed</span> <!--
+--><span class="hljs-attribute">-i</span> <!--
+--><span class="hljs-attribute">-r</span> <!--
+-->'s/#?;#//g' <!--
+-->/etc/nginx/sites-{{ isSymlink() ? 'available' : 'enabled' }}/{{ domain() }}.conf
+<!--
--></span>