Merge branch 'master' into v7

NethServer · Apr 19, 2018 · 912d326 · 912d326
2 parents 2207dc2 + ffed8b3
commit 912d326
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 1 deletion.
diff --git a/administrator-manual/en/subscription.rst b/administrator-manual/en/subscription.rst
@@ -24,3 +24,12 @@ Monitoring and access to stable repositories are automatically enabeld.
 
 .. [#Dartagnan] Dartagnan documentation: https://nethesis.github.io/dartagnan/
 .. [#Nethesis] Nethesis official site: http://www.nethesis.it
+
+Removing a subscription
+=======================
+
+When the subscription expires, or at the end of a trial period, use the following command to
+revert any modification to repositories and access the community ones: ::
+
+  config setprop Secret '' SystemId ''
+  eorepo base centos-sclo-rh centos-sclo-sclo epel extras nethforge nethserver-base nethserver-updates updates
diff --git a/developer-manual/en/modules b/developer-manual/en/modules
@@ -41,3 +41,4 @@ nethserver-yum-cron
 nethserver-rh-php71-php-fpm
 nethserver-rh-php56-php-fpm
 nethserver-mattermost
+nethserver-letsencrypt
diff --git a/developer-manual/en/nethserver-base.rst b/developer-manual/en/nethserver-base.rst
@@ -171,7 +171,7 @@ configuration by following these steps.
 
    Delete all interfaces: ::
 
-     db network delete eth0
+     db networks delete eth0
 
    Repeat the operation for all interfaces including bridges, bonds
    and vlans.

diff --git a/developer-manual/en/nethserver-letsencrypt.rst b/developer-manual/en/nethserver-letsencrypt.rst
@@ -0,0 +1,21 @@
+======================
+nethserver-letsencrypt
+======================
+
+This package requests and automatically renews Let's Encrypt (LE) certificates.
+It adds httpd ACME-related configuration for all defined virtual hosts.
+
+The main helper ``/usr/libexec/nethserver/letsencrypt-certs`` can be executed also from command line.
+
+For more info, see: ::
+
+  /usr/libexec/nethserver/letsencrypt-certs -h 
+
+
+Database properties under ``pki`` key inside ``configuration`` database:
+
+- ``LetsEncryptRenewDays``: days to the expiration, the certificate will be renewd when the condition is met
+- ``LetsEncryptMail``: (optional) registration mail for LE notifications
+- ``LetsEncryptDomains``: comma-separated list of domains added to certificate SAN field
+
+