saving uncommitted changes in /etc prior to apt run

diff --git a/.etckeeper b/.etckeeper
index a7861be8b129bae67492108df25308a8e45197c1..7310a2069d1a298fd2d0d8cbf1dfa3c0b45b4035 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -228,6 +228,8 @@ maybe chmod 0755 'apache2/sites-available'
 maybe chmod 0644 'apache2/sites-available/000-default.conf'
 maybe chmod 0644 'apache2/sites-available/default-ssl.conf'
 maybe chmod 0644 'apache2/sites-available/hoellein.online.conf'
+maybe chmod 0644 'apache2/sites-available/http_hoellein.online.conf'
+maybe chmod 0644 'apache2/sites-available/http_nextcloud.conf'
 maybe chmod 0644 'apache2/sites-available/http_siedlerverein.conf'
 maybe chmod 0644 'apache2/sites-available/nextcloud.conf'
 maybe chmod 0644 'apache2/sites-available/nextcloud_siedlerverein.conf'
@@ -767,6 +769,12 @@ maybe chmod 0644 'ldap/ldap.conf'
 maybe chmod 0644 'legal'
 maybe chmod 0755 'letsencrypt'
 maybe chmod 0700 'letsencrypt/accounts'
+maybe chmod 0700 'letsencrypt/accounts/acme-staging-v02.api.letsencrypt.org'
+maybe chmod 0700 'letsencrypt/accounts/acme-staging-v02.api.letsencrypt.org/directory'
+maybe chmod 0700 'letsencrypt/accounts/acme-staging-v02.api.letsencrypt.org/directory/b1c3290bbaba0a2824bdd82acb119181'
+maybe chmod 0644 'letsencrypt/accounts/acme-staging-v02.api.letsencrypt.org/directory/b1c3290bbaba0a2824bdd82acb119181/meta.json'
+maybe chmod 0400 'letsencrypt/accounts/acme-staging-v02.api.letsencrypt.org/directory/b1c3290bbaba0a2824bdd82acb119181/private_key.json'
+maybe chmod 0644 'letsencrypt/accounts/acme-staging-v02.api.letsencrypt.org/directory/b1c3290bbaba0a2824bdd82acb119181/regr.json'
 maybe chmod 0700 'letsencrypt/accounts/acme-v01.api.letsencrypt.org'
 maybe chmod 0700 'letsencrypt/accounts/acme-v01.api.letsencrypt.org/directory'
 maybe chmod 0700 'letsencrypt/accounts/acme-v01.api.letsencrypt.org/directory/a089d0e38c551495d1f75d5adc8a26ee'
@@ -828,6 +836,8 @@ maybe chmod 0644 'letsencrypt/csr/0012_csr-certbot.pem'
 maybe chmod 0644 'letsencrypt/csr/0013_csr-certbot.pem'
 maybe chmod 0644 'letsencrypt/csr/0014_csr-certbot.pem'
 maybe chmod 0644 'letsencrypt/csr/0015_csr-certbot.pem'
+maybe chmod 0644 'letsencrypt/csr/0016_csr-certbot.pem'
+maybe chmod 0644 'letsencrypt/csr/0017_csr-certbot.pem'
 maybe chmod 0700 'letsencrypt/keys'
 maybe chmod 0600 'letsencrypt/keys/0000_key-certbot.pem'
 maybe chmod 0600 'letsencrypt/keys/0001_key-certbot.pem'
@@ -845,6 +855,8 @@ maybe chmod 0600 'letsencrypt/keys/0012_key-certbot.pem'
 maybe chmod 0600 'letsencrypt/keys/0013_key-certbot.pem'
 maybe chmod 0600 'letsencrypt/keys/0014_key-certbot.pem'
 maybe chmod 0600 'letsencrypt/keys/0015_key-certbot.pem'
+maybe chmod 0600 'letsencrypt/keys/0016_key-certbot.pem'
+maybe chmod 0600 'letsencrypt/keys/0017_key-certbot.pem'
 maybe chmod 0700 'letsencrypt/live'
 maybe chmod 0755 'letsencrypt/live/hoellein.online'
 maybe chmod 0755 'letsencrypt/live/hoellein.online-0001'

diff --git a/apache2/sites-available/hoellein.online.conf b/apache2/sites-available/hoellein.online.conf
index 6f2f47c61c7fcfa7df29b0494c86033d6f97188b..ada26833f105f4f6c4b0d162467b95447e89bd6c 100644 (file)
--- a/apache2/sites-available/hoellein.online.conf
+++ b/apache2/sites-available/hoellein.online.conf
@@ -7,12 +7,12 @@
                 ServerAdmin webmaster@localhost
                 DocumentRoot /var/www/wordpress/
                 ServerName hoellein.online:443
-                ServerAlias hoellein.online
+                ServerAlias www.hoellein.online
                 <Directory />
                         Options FollowSymLinks
                         AllowOverride all
                 </Directory>
-                <Directory /var/www/nextcloud/>
+                <Directory /var/www/wordpress/>
                         SetEnv HOME /var/www/wordpress
                         SetEnv HTTP_HOME /var/www/wordpress
                         Options Indexes FollowSymLinks MultiViews
@@ -25,7 +25,7 @@
                 </LocationMatch>
                 RewriteEngine on
                 ScriptAlias /cgi-bin/ /var/www/wordpress/cgi-bin/
-                <Directory "/var/www/nextcloud/cgi-bin">
+                <Directory "/var/www/wordpress/cgi-bin">
                         AllowOverride None
                         Options +ExecCGI -MultiViews +SymLinksIfOwnerMatch
 #                       Order allow,deny
@@ -47,7 +47,7 @@
                 <FilesMatch "\.(cgi|shtml|phtml|php)$">
                         SSLOptions +StdEnvVars
                 </FilesMatch>
-                <Directory /var/www/nextcloud/cgi-bin/>
+                <Directory /var/www/wordpress/cgi-bin/>
                         SSLOptions +StdEnvVars
                 </Directory>
 

diff --git a/apache2/sites-available/http_hoellein.online.conf b/apache2/sites-available/http_hoellein.online.conf
new file mode 100644 (file)
index 0000000..3c2b034
--- /dev/null
+++ b/apache2/sites-available/http_hoellein.online.conf
@@ -0,0 +1,5 @@
+<VirtualHost *:80>
+    ServerName hoellein.online
+    ServerAlias www.hoellein.online
+    Redirect / https://www.hoellein.online
+</VirtualHost>

diff --git a/apache2/sites-available/http_nextcloud.conf b/apache2/sites-available/http_nextcloud.conf
new file mode 100644 (file)
index 0000000..f3de464
--- /dev/null
+++ b/apache2/sites-available/http_nextcloud.conf
@@ -0,0 +1,5 @@
+<VirtualHost *:80>
+    ServerName nextcloud.hoellein.online
+    ServerAlias www.nextcloud.hoellein.online
+    Redirect / https://nextcloud.hoellein.online
+</VirtualHost>

diff --git a/apache2/sites-available/piwik.conf b/apache2/sites-available/piwik.conf
index 3fa165755951abd1f2d50883ee6fb21a38eb4a64..18112d44c98e9cb2d94a18ac954892e9f021a769 100644 (file)
--- a/apache2/sites-available/piwik.conf
+++ b/apache2/sites-available/piwik.conf
@@ -38,7 +38,7 @@
                 # alert, emerg.
                 LogLevel debug
                 ErrorLog ${APACHE_LOG_DIR}/piwik.hoellein.online_error.log
-                CustomLog ${APACHE_LOG_DIR}/piwik.hoellein..online_access.log combined
+                CustomLog ${APACHE_LOG_DIR}/piwik.hoellein.online.log combined
 
                 #   SSL Engine Switch:
                 #   Enable/Disable SSL for this virtual host.

diff --git a/apache2/sites-available/siedlerverein.conf b/apache2/sites-available/siedlerverein.conf
index 24cf77be7bfd4399d9a8cdd3819728e1f13b568d..1866b37e4c6189f8bb2762c533614bd03fe6a6df 100644 (file)
--- a/apache2/sites-available/siedlerverein.conf
+++ b/apache2/sites-available/siedlerverein.conf
@@ -37,8 +37,8 @@
                 # Possible values include: debug, info, notice, warn, error, crit,
                 # alert, emerg.
                 LogLevel debug
-                ErrorLog ${APACHE_LOG_DIR}/siedlerverein.online_error.log
-                CustomLog ${APACHE_LOG_DIR}/siedlerverein.online_access.log combined
+                ErrorLog ${APACHE_LOG_DIR}/siedlerverein-wittgensdorf.de_error.log
+                CustomLog ${APACHE_LOG_DIR}/siedlerverein-wittgensdorf.de.log combined
 
                 #   SSL Engine Switch:
                 #   Enable/Disable SSL for this virtual host.

diff --git a/apache2/sites-enabled/000-default.conf b/apache2/sites-enabled/000-default.conf
deleted file mode 120000 (symlink)
index 3c4632b..0000000
--- a/apache2/sites-enabled/000-default.conf
+++ /dev/null
@@ -1 +0,0 @@
-../sites-available/000-default.conf
\ No newline at end of file

diff --git a/apache2/sites-enabled/http_hoellein.online.conf b/apache2/sites-enabled/http_hoellein.online.conf
new file mode 120000 (symlink)
index 0000000..fac99f3
--- /dev/null
+++ b/apache2/sites-enabled/http_hoellein.online.conf
@@ -0,0 +1 @@
+../sites-available/http_hoellein.online.conf
\ No newline at end of file

diff --git a/apache2/sites-enabled/http_nextcloud.conf b/apache2/sites-enabled/http_nextcloud.conf
new file mode 120000 (symlink)
index 0000000..e3e8126
--- /dev/null
+++ b/apache2/sites-enabled/http_nextcloud.conf
@@ -0,0 +1 @@
+../sites-available/http_nextcloud.conf
\ No newline at end of file

diff --git a/letsencrypt/accounts/acme-staging-v02.api.letsencrypt.org/directory/b1c3290bbaba0a2824bdd82acb119181/meta.json b/letsencrypt/accounts/acme-staging-v02.api.letsencrypt.org/directory/b1c3290bbaba0a2824bdd82acb119181/meta.json
new file mode 100644 (file)
index 0000000..dbb006f
--- /dev/null
+++ b/letsencrypt/accounts/acme-staging-v02.api.letsencrypt.org/directory/b1c3290bbaba0a2824bdd82acb119181/meta.json
@@ -0,0 +1 @@
+{"creation_dt": "2018-11-01T12:16:16Z", "creation_host": "vmd31768"}
\ No newline at end of file

diff --git a/letsencrypt/accounts/acme-staging-v02.api.letsencrypt.org/directory/b1c3290bbaba0a2824bdd82acb119181/private_key.json b/letsencrypt/accounts/acme-staging-v02.api.letsencrypt.org/directory/b1c3290bbaba0a2824bdd82acb119181/private_key.json
new file mode 100644 (file)
index 0000000..1d4fb93
--- /dev/null
+++ b/letsencrypt/accounts/acme-staging-v02.api.letsencrypt.org/directory/b1c3290bbaba0a2824bdd82acb119181/private_key.json
@@ -0,0 +1 @@
+{"n": "9uUoPN8y3RLpRRviw7Eb2ETvZbaw4QD89TboPBtISx0KN6l8tpupN2vPNZhN14Tg2CGQ7uBF21aO7_L8EpBfR8uKXL1Ti89V9Z3fzdUcEJZ4YfSci7IxIGz4Uwo1WFKd4_dLAWzMccdeoMsyMQCpf7tc7URjzJzpZ1WcU1LDPz3wDeh1Z8B2GoDfmG1IRGlgT-VoALVQLwsRdGwOZxscdReQeuDEf5MC71DRXkY2fOdBZ9rzGNLV3_hfJA9KMZqKInkgttR64CGSHZE8YOU4fcxRv6E5TawYC2DcApRx61K_Ug3A08RWHW5uUoTA9KHh85lA6kceLj_1HJr8tlpqmQ", "e": "AQAB", "d": "AbH9Hr3hmYcBtwnD-tgCeu-uPSKOAF2DXyOrYI5HZsyiP1OYmaBj_w9scs_C6RHugU1ps1oy4JitjpQ6it4W6WVKY-yg4DriOjeFS-KEuNBvryyAzqzAjZpx8hAF4b9feis-hpn6pWVbDvuWMqPwhgIBV1e637LMH3uFAUV2Nb7xrSksuIE97aO57PlSZHaaEFe-cxeV5J301j98HR_PMuA5CIV298DXLXnkLtUMd5S8x_yTw8z-sGBX2b7hw7B6bDX9_OEJAGnqxVygJdLTFMsMmbG6qMBPq8Xb-GGEXmDOq02899KVzuL2uoPx_eHxVAJVirHB5t1z1Nsz4CjgIQ", "p": "_OG9z5f3HV-RX0zt7IRXjxGUKyro894fI5jnYuzmqpUG_oS5TUD4-FwGtvY1yA6gi-MqydOA1HuyzySj3upD-Uiy9OCgqqe1M4vac7dV6Af2CnwXmPURTfNi9D5E-6m_xCcopCyXWEzOqioA27JvYgKGTlXKqCi4nXJiREoLNIU", "q": "-fCEmXp5dKxXSUiDIdiI-_EOy7gyMz2qP6lF4uHJT1oi04eBpBAP1zH4YIl_McUzKSjko--OB3AzOp0nbl30pzbV_LE2KCSO93EPzzvHsEBJifhBvsr32NZEl_xaaczaELjironZAYdd_nswjJweeAEx7E5XtoVTvwbuWTZoFAU", "dp": "69Cuqjlx7WhDLfWVISvAYt_npeGb3l3R9-YMUAnOiF_0Z7_o9IuUIDXg5RjvyiEpwYkTS6X5yyuW8OegEK2wuXP7vbMC4GEH7ouKKMJcT8WswNY7Qx21B1XhfxXaSjxfYVGK6p3SfDsTtUb6CeV5TJJCICaMlwdyMRCLZlcN3-k", "dq": "3OTuPDrbFvut1S3J_2LBhnFA01mCvHi2e7cd9ev5IDGYb_zl3dr4NQeL7b33dURE-A6VLDHvA7HtBNOZ4tgU_qffLYptQ8Mzu4roHw5FaQcYN2D6siXuMG0GiJDWU4ViAL92UC2yZcB-mQfFG7Bq2UKtHZ0LtltVbZIxmxUTnQU", "qi": "wQuL95WAjTdq-5q83fw9lGEhypTHdCIOwgbiZwcuhV5fETUCVTIcZ-wKMXWYHhq9LJD83dCE2ex36JbPitXqKB98IFeqV7yHdgB-00_nAJstfBCL-dMndqMjsgtzAoDV-jprLihQybOKr-GojDxt0VMnQ8KrJLvWBAHgkhzZj2o", "kty": "RSA"}
\ No newline at end of file

diff --git a/letsencrypt/accounts/acme-staging-v02.api.letsencrypt.org/directory/b1c3290bbaba0a2824bdd82acb119181/regr.json b/letsencrypt/accounts/acme-staging-v02.api.letsencrypt.org/directory/b1c3290bbaba0a2824bdd82acb119181/regr.json
new file mode 100644 (file)
index 0000000..ed53117
--- /dev/null
+++ b/letsencrypt/accounts/acme-staging-v02.api.letsencrypt.org/directory/b1c3290bbaba0a2824bdd82acb119181/regr.json
@@ -0,0 +1 @@
+{"body": {"key": {"n": "9uUoPN8y3RLpRRviw7Eb2ETvZbaw4QD89TboPBtISx0KN6l8tpupN2vPNZhN14Tg2CGQ7uBF21aO7_L8EpBfR8uKXL1Ti89V9Z3fzdUcEJZ4YfSci7IxIGz4Uwo1WFKd4_dLAWzMccdeoMsyMQCpf7tc7URjzJzpZ1WcU1LDPz3wDeh1Z8B2GoDfmG1IRGlgT-VoALVQLwsRdGwOZxscdReQeuDEf5MC71DRXkY2fOdBZ9rzGNLV3_hfJA9KMZqKInkgttR64CGSHZE8YOU4fcxRv6E5TawYC2DcApRx61K_Ug3A08RWHW5uUoTA9KHh85lA6kceLj_1HJr8tlpqmQ", "e": "AQAB", "kty": "RSA"}, "status": "valid"}, "uri": "https://acme-staging-v02.api.letsencrypt.org/acme/acct/7258654", "terms_of_service": "https://letsencrypt.org/documents/LE-SA-v1.2-November-15-2017.pdf"}
\ No newline at end of file

diff --git a/letsencrypt/csr/0016_csr-certbot.pem b/letsencrypt/csr/0016_csr-certbot.pem
new file mode 100644 (file)
index 0000000..f49cc40
--- /dev/null
+++ b/letsencrypt/csr/0016_csr-certbot.pem
@@ -0,0 +1,20 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIIDMTCCAhkCAQIwADCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANMv
+B4zokyZPH+4VftVnnaknGPTmeOSMpCbNPjn9ZYeJNSZxATTHffby5A99n5TN9q3X
+wq07jvKBu/EhRjWrn1kBxIQ9U+kP6pticFcK0aBUe1g+2qLQqC7eGM6tnZQ2zNqN
+TJwxAWtE92IW87OyGZSbDVOILRtZ6JV0a0s4FgzzddCPqTn4H4qQFyZLfzQNB5Xc
+f54TBjCLOTKTNqjoP8EcBZGH4kkVTxYAhFgcKRcZp0mZLDw8UhI9TljFL+bfqBOD
+FpgufaMvYzziBpnTIermcCotNF0lFasRe6ee9lc5g0G5TJ+wEFQkjHtDxrjVKzap
+2v+P6lg8OqhD/+d2qx8CAwEAAaCB6zCB6AYJKoZIhvcNAQkOMYHaMIHXMIHUBgNV
+HREEgcwwgcmCGW5leHRjbG91ZC5ob2VsbGVpbi5vbmxpbmWCHXNpZWRsZXJ2ZXJl
+aW4td2l0dGdlbnNkb3JmLmRlgg9ob2VsbGVpbi5vbmxpbmWCGW5leHRjbG91ZC5o
+b2VsbGVpbi5vbmxpbmWCJ25leHRjbG91ZC5zaWVkbGVydmVyZWluLXdpdHRnZW5z
+ZG9yZi5kZYIhd3d3LnNpZWRsZXJ2ZXJlaW4td2l0dGdlbnNkb3JmLmRlghVwaXdp
+ay5ob2VsbGVpbi5vbmxpbmUwDQYJKoZIhvcNAQELBQADggEBALFmMTdQgc61Xx5R
+7URlxHWscksvhLPCAhf61SiQzcdOaWTZA+tgByXDMPVqVp8XgcmqTCKyKyYxmNJ6
+DZvDCRExHIGsFTXN08BWROJJVroqeRSPW0f6Al3+693jwUzJ1jAKGTRL+lE6H301
+JiqEZgxl8lUPAMNC4o/Rw2QYxS1AMk5mefOaXGZx91YwdPKud6q0uwsKVOzT6LBF
+UZ3mtXsCmASCt9G8h8gaAf5heuAybGwrXr60UxDSJUXLufJ4eK1Mb/x+OpOoVwVJ
+xVuU6f0pKif3YXIbypyZckzGLlMzQPdrodYjrXq/Iz179+0sF0rI1+9ur/Boz7rI
+wbgVRgQ=
+-----END CERTIFICATE REQUEST-----

diff --git a/letsencrypt/csr/0017_csr-certbot.pem b/letsencrypt/csr/0017_csr-certbot.pem
new file mode 100644 (file)
index 0000000..300f65e
--- /dev/null
+++ b/letsencrypt/csr/0017_csr-certbot.pem
@@ -0,0 +1,16 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIICeTCCAWECAQIwADCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKR0
+EViu20/dMlHmwV2nluFeervvVNI8mip2tW7cu7P2LCh3yQz52LZLlWknZ8qQmP1o
+s/laS4/M9YViI0PIo2vYWapc/lmFRMF04POJ3xxQnpDr9N3gR2A7SGBu0O0mcjAd
+xXdcgvd/BwK5Q6bWvW4mu3sf2/YpvmW0g/bZWKTev1u0jb85vtC0/EGb+vy2n6sz
+bueGTwl6n/glLZ6Mt8p4AzIJ64nCChQETbIQgB4nLlfu4hSTIEAyMlft70ryzwat
+kD0it9kV5cLp38ZHz6cFEYiIwxeqQ0+f/yGoiLHbt0W/iaLC7nzCK+g6/WF1/iW2
+i11cx20xnHZqSlgd8psCAwEAAaA0MDIGCSqGSIb3DQEJDjElMCMwIQYDVR0RBBow
+GIIWL3Zhci93d3cvc2llZGxlcnZlcmVpbjANBgkqhkiG9w0BAQsFAAOCAQEAB8YT
+XY+dyxCtw4zD7Hc5cAVfA2z4BTHjvwUDIa50c1lt3mPdAuXd7uERD5qU5JhZoJIv
+s3+KY1FvD/F+NH4ZQrqmOh5YuLBp683o1wDqsuxT4kK6/SPPPVsDIsT5skn1mFrb
+k4rP10M6qNjP9ZSKhbPMY3p0ctlcocvG7Sl2plYtn5VCx8nrMbhy+Jk3wRZS5imW
+kHFWbk71GTGmbpTDjQqqPrheHc+qeyGgW/dbv/mxfURyhs80eGEGKZIQTCNLZtWC
+dn0i3fn9/K8B/vcYPMzgqHQbf9v4JRicczlbiPUDRGJs6tTHxBbgIYlUeHtNOJEN
+/YkjtTZQZZcFXd6/Sw==
+-----END CERTIFICATE REQUEST-----

diff --git a/letsencrypt/keys/0016_key-certbot.pem b/letsencrypt/keys/0016_key-certbot.pem
new file mode 100644 (file)
index 0000000..d37f1bd
--- /dev/null
+++ b/letsencrypt/keys/0016_key-certbot.pem
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDTLweM6JMmTx/u
+FX7VZ52pJxj05njkjKQmzT45/WWHiTUmcQE0x3328uQPfZ+Uzfat18KtO47ygbvx
+IUY1q59ZAcSEPVPpD+qbYnBXCtGgVHtYPtqi0Kgu3hjOrZ2UNszajUycMQFrRPdi
+FvOzshmUmw1TiC0bWeiVdGtLOBYM83XQj6k5+B+KkBcmS380DQeV3H+eEwYwizky
+kzao6D/BHAWRh+JJFU8WAIRYHCkXGadJmSw8PFISPU5YxS/m36gTgxaYLn2jL2M8
+4gaZ0yHq5nAqLTRdJRWrEXunnvZXOYNBuUyfsBBUJIx7Q8a41Ss2qdr/j+pYPDqo
+Q//ndqsfAgMBAAECggEAd2kzSsDDW7kH4/axlfeV1WyvFuMu3oSL2Qjas62NeDrk
+G81wEijvF/C1dfDhiCGB50CF6rAvnv4uiCT5byWQ36I5PVD0HmeKj7v0q7MJXzAF
+4pr/w2pafs3ElzDiVkk6QiX9eJ/ZHo+LliJGQIhnIHkf6uioILwQ4FlIxep7xWvp
+LPG7aALxgNz1tbrB3r0DPyAss9GqngC85bP5f4h0cFhuoTcQMPM355uWDGkAMa8N
+zXsdQXXQQoSvu9OkB2+OMapxxq1AXUv7oBRIKCxs34f/1RvblcVWjM3kS7BnAT+3
+WzxOiCKD+a1b+ka6B6elMPnGVBFsFr5vFE5zS8pkIQKBgQDzUp8P3DM8IRPa//TM
+kyvG5YFnY4TehAH6v/xpPDqmHu/3Ldt7jnBgv1HvU0CdUq9dKZCcVy0RsAckdGe7
+BHhZtIiVxUnqfdmy33aa1h3OEJ5WkWL5+SoaApq7lJRqGdSFaMzit/VMxDNRbkK4
+Npq+p+apFCwVNN2QlgSvJPnFjwKBgQDeL77mBbT2ENQDtFI835nXiXypw/OShsz3
+aeY7f1vCCpdyDrezTqa4pEsFvAQybn0DuBzhkwJuggZJnH7kxTK+XdBDUY5RWP4O
+15KIszphcQjxJ7CWMLbw8wIOFCC9Q2uiF4rdECgNVZ0I9Fm8cVGqIHjaWeyS69LZ
+VSS25ZyZcQKBgHa2KpBsWDrP0IYaNm7Qpp0FP9sXPK3rLaQOorEdB2gg0+Z+YwSm
++8DX1ruynGWk/5WuP7Vm+sAUZ4ermygtCCKL589aT7Ot7tZMG+ty51uv0/BcQjO/
+EoFaH+/Aj6AsNflYpg0+vtjTKE5kQvzo9xpphCmdg9xczHRMHMDug0WVAoGALZop
+GTb0pEhh63y4IExYW/eZAZL5TAqkyOcQXQfPwmzAFqXUqFWtPFpkF4I2bk9lEz1X
+mCi/KAVB2xvmo3eh6ZaBpz928VVNl6hBKBN5GQTFLBHUWY8YDS4jLtaMvau3zKX+
+V074mXwH5g2Y2Wd8tmlBxLcOKj2Coh6qkWthD9ECgYEA7qI1HEmmtKqqbBcfFaRI
+9RAxUsCgdas++mIyzn2A79Fqin22eiwqWUOyrbffbDKNMdPdzXhfT4ItavWC5TEO
+Z6l1XcvCLKI97sdQnkMRlIAAUyfWzLTw6NDldrFS6/9r0MZ33Ssz1mlGnYwwTgk2
+xz4iGdTjsOrmoIwGLhq6+4w=
+-----END PRIVATE KEY-----

diff --git a/letsencrypt/keys/0017_key-certbot.pem b/letsencrypt/keys/0017_key-certbot.pem
new file mode 100644 (file)
index 0000000..46e0da1
--- /dev/null
+++ b/letsencrypt/keys/0017_key-certbot.pem
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCkdBFYrttP3TJR
+5sFdp5bhXnq771TSPJoqdrVu3Luz9iwod8kM+di2S5VpJ2fKkJj9aLP5WkuPzPWF
+YiNDyKNr2FmqXP5ZhUTBdODzid8cUJ6Q6/Td4EdgO0hgbtDtJnIwHcV3XIL3fwcC
+uUOm1r1uJrt7H9v2Kb5ltIP22Vik3r9btI2/Ob7QtPxBm/r8tp+rM27nhk8Jep/4
+JS2ejLfKeAMyCeuJwgoUBE2yEIAeJy5X7uIUkyBAMjJX7e9K8s8GrZA9IrfZFeXC
+6d/GR8+nBRGIiMMXqkNPn/8hqIix27dFv4miwu58wivoOv1hdf4ltotdXMdtMZx2
+akpYHfKbAgMBAAECggEAFG+X+D1CY5pJNoRGYy0AQuFKvy/uinGddslpom0rpiFh
+O2YnRcWGeKDL4FVVQIbXfCYWt1XRLf16RSj82N+F71DjU5hawyUcdi3gBmOLpike
+i0PHGgtU01CKnfEnZVDxv6jzcPG+FKNka6I6FfF5eMa3ZYWAAAcP8fOMspAvw8z3
+W1WvgqfLcXrhtRgFl9Y9lmqhDJWhwLeiyOSpEnNAd7zE1H59Uo1EmuVU51Sp7g0p
+0PmZ5YeexLyF99uFngCHnZZJ6GbfFad/uNntzrvUAEeqEe6bGjlz6g9C3kCL0Aan
+6u+ONFP40lg8qjOuJBo3ruwqG8H8z5S68QvngSBgAQKBgQDPAtCDwPRSxR8CPUxb
+KaDYXU2rcucxGnHhu41xHPMaPgm+huilmiFNb6t/pLV2WPPURaHdaPpyffrPSg4U
+G2TGq9mHqG+rFSE8l5FdSSzhEA8KZKk8rmrkgZoJU8PLxfReqoic7m5I1r17UYmk
+TAC+xzWKhePzPiUV7ZKnQa5hmwKBgQDLXwTkg1KO9cKjgr9yD5HV/q0y4g3RSUT8
+leIcWHlVyN8JR/HwZv8Q4WThxaLrghXvAJcc1s1aYk0uG2g79IRM0JVuuGJX0FKK
++0MtN+YJXkOoyZKq2ULzEE/9bThp6tH4/xDqkg/VOtt6slgQajF7b3uwn8SBJfKL
+YeZ06OxDAQKBgQDA3ppvZuM8CrRtXbc6aHqXm7a1uoR0V3MrIZcSgCpvlMV3YjJ3
+uDa28wgSEN+QuCfU6lt48koFSiLX5uNfEHbAM3Sk0+XWvAUPcxfYlkjeGBwrTsXu
+54JoC+f8MLMHtBON780AiZTvAEPiFYHsNXOsS+YyfbR3+LqMx6APfT5/aQKBgHKd
+Z319wV6OhRZvzoNy4ObwtB30JoNnvrh3pEoDVsaRAZoScPjioyeZT6iqIMqHsuLS
+u1dme69PrV2p1pHLmXBNMZqH0ezZnFt1hgOK+FsZRBpxF/avoTqpW9tg3aVb0OB6
+p8b7cG7kz+MTdewyXRbK2rPNJwr+HvaMwzvqNZUBAoGAJJeMPuI/rL6eWLg4oxL4
+uWFQBYjaad/KXZEVa69DVm3OF1Aj9LEKTTN5DvBH67svu22ecxq8AK2WBd00z5SY
+fr8SH1KwFlSJRlCcgYjmPh/53vhe/DSGExSFMeelVDqEjYEEPJlpHOiR45TGl38H
+V70u7JD+BpcOCKuFTL5YZqw=
+-----END PRIVATE KEY-----

diff --git a/rsnapshot.conf b/rsnapshot.conf
index 30453380825ce4f5f5dea83372c0162b86f360e0..709a3d66e09ecff79f7de50ff09a8a23b8f85b7e 100644 (file)
--- a/rsnapshot.conf
+++ b/rsnapshot.conf
@@ -90,7 +90,7 @@ cmd_logger    /usr/bin/logger
 # e.g. alpha, beta, gamma, etc.         #
 #########################################
 
-hourly hourly  4       
+retain hourly  4       
 retain daily   7
 retain weekly  4
 retain monthly 4