File certbot-fix_constants.patch of Package certbot

Overview Repositories Revisions Requests Users Attributes Meta

File certbot-fix_constants.patch of Package certbot (Revision 03822f5055f34b5222f7b0e23e53d1be)

Currently displaying revision 03822f5055f34b5222f7b0e23e53d1be , Show latest

diff -Pdpru certbot-0.33.1.orig/certbot/cert_manager.py certbot-0.33.1/certbot/cert_manager.py
--- certbot-0.33.1.orig/certbot/cert_manager.py	2019-04-05 00:24:43.000000000 +0200
+++ certbot-0.33.1/certbot/cert_manager.py	2019-04-06 01:35:47.669822639 +0200
@@ -169,7 +169,7 @@ def find_duplicative_certs(config, domai
 
 def _archive_files(candidate_lineage, filetype):
     """ In order to match things like:
-        /etc/letsencrypt/archive/example.com/chain1.pem.
+        /etc/certbot/archive/example.com/chain1.pem.
 
         Anonymous functions which call this function are eventually passed (in a list) to
         `match_and_check_overlaps` to help specify the acceptable_matches.
diff -Pdpru certbot-0.33.1.orig/certbot/cli.py certbot-0.33.1/certbot/cli.py
--- certbot-0.33.1.orig/certbot/cli.py	2019-04-05 00:24:43.000000000 +0200
+++ certbot-0.33.1/certbot/cli.py	2019-04-06 01:35:37.281601163 +0200
@@ -436,7 +436,7 @@ VERB_HELP = [
         "usage": "\n\n  certbot plugins [options]\n\n"
     }),
     ("update_symlinks", {
-        "short": "Recreate symlinks in your /etc/letsencrypt/live/ directory",
+        "short": "Recreate symlinks in your /etc/certbot/live/ directory",
         "opts": ("Recreates certificate and key symlinks in {0}, if you changed them by hand "
                  "or edited a renewal configuration file".format(
                   os.path.join(flag_default("config_dir"), "live"))),
@@ -1223,7 +1223,7 @@ def prepare_and_parse_args(plugins, args
         help='Command to be run in a shell once for each successfully'
         ' issued certificate. For this command, the shell variable'
         ' $RENEWED_LINEAGE will point to the config live subdirectory'
-        ' (for example, "/etc/letsencrypt/live/example.com") containing'
+        ' (for example, "/etc/certbot/live/example.com") containing'
         ' the new certificates and keys; the shell variable'
         ' $RENEWED_DOMAINS will contain a space-delimited list of'
         ' renewed certificate domains (for example, "example.com'
diff -Pdpru certbot-0.33.1.orig/certbot/compat/misc.py certbot-0.33.1/certbot/compat/misc.py
--- certbot-0.33.1.orig/certbot/compat/misc.py	2019-04-05 00:24:43.000000000 +0200
+++ certbot-0.33.1/certbot/compat/misc.py	2019-04-06 01:21:40.587755349 +0200
@@ -125,9 +125,9 @@ WINDOWS_DEFAULT_FOLDERS = {
     'logs': 'C:\\Certbot\\log',
 }
 LINUX_DEFAULT_FOLDERS = {
-    'config': '/etc/letsencrypt',
-    'work': '/var/lib/letsencrypt',
-    'logs': '/var/log/letsencrypt',
+    'config': '/etc/certbot',
+    'work': '/var/lib/certbot',
+    'logs': '/var/log/certbot',
 }
 
 
diff -Pdpru certbot-0.33.1.orig/certbot/constants.py certbot-0.33.1/certbot/constants.py
--- certbot-0.33.1.orig/certbot/constants.py	2019-04-05 00:24:43.000000000 +0200
+++ certbot-0.33.1/certbot/constants.py	2019-04-06 01:22:40.297029698 +0200
@@ -19,7 +19,7 @@ CLI_DEFAULTS = dict(
         os.path.join(misc.get_default_folder('config'), 'cli.ini'),
         # http://freedesktop.org/wiki/Software/xdg-user-dirs/
         os.path.join(os.environ.get("XDG_CONFIG_HOME", "~/.config"),
-                     "letsencrypt", "cli.ini"),
+                     "certbot", "cli.ini"),
     ],
 
     # Main parser
diff -Pdpru certbot-0.33.1.orig/certbot/tests/cli_test.py certbot-0.33.1/certbot/tests/cli_test.py
--- certbot-0.33.1.orig/certbot/tests/cli_test.py	2019-04-05 00:24:43.000000000 +0200
+++ certbot-0.33.1/certbot/tests/cli_test.py	2019-04-06 01:24:51.227823472 +0200
@@ -47,9 +47,9 @@ class FlagDefaultTest(unittest.TestCase)
 
     def test_linux_directories(self):
         if 'fcntl' in sys.modules:
-            self.assertEqual(cli.flag_default('config_dir'), '/etc/letsencrypt')
-            self.assertEqual(cli.flag_default('work_dir'), '/var/lib/letsencrypt')
-            self.assertEqual(cli.flag_default('logs_dir'), '/var/log/letsencrypt')
+            self.assertEqual(cli.flag_default('config_dir'), '/etc/certbot')
+            self.assertEqual(cli.flag_default('work_dir'), '/var/lib/certbot')
+            self.assertEqual(cli.flag_default('logs_dir'), '/var/log/certbot')
 
 
 class ParseTest(unittest.TestCase):  # pylint: disable=too-many-public-methods
diff -Pdpru certbot-0.33.1.orig/certbot/tests/ocsp_test.py certbot-0.33.1/certbot/tests/ocsp_test.py
--- certbot-0.33.1.orig/certbot/tests/ocsp_test.py	2019-04-05 00:24:43.000000000 +0200
+++ certbot-0.33.1/certbot/tests/ocsp_test.py	2019-04-06 01:34:56.380729146 +0200
@@ -243,7 +243,7 @@ def _construct_mock_ocsp_response(certif
 
 # pylint: disable=line-too-long
 openssl_confused = ("", """
-/etc/letsencrypt/live/example.org/cert.pem: good
+/etc/certbot/live/example.org/cert.pem: good
 	This Update: Dec 17 00:00:00 2016 GMT
 	Next Update: Dec 24 00:00:00 2016 GMT
 """,
diff -Pdpru certbot-0.33.1.orig/certbot/tests/testdata/sample-renewal-ancient.conf certbot-0.33.1/certbot/tests/testdata/sample-renewal-ancient.conf
--- certbot-0.33.1.orig/certbot/tests/testdata/sample-renewal-ancient.conf	2019-04-05 00:24:43.000000000 +0200
+++ certbot-0.33.1/certbot/tests/testdata/sample-renewal-ancient.conf	2019-04-06 01:34:38.012337522 +0200
@@ -21,7 +21,7 @@ text_mode = False
 func = <function obtain_cert at 0x7f093a163c08>
 staging = True
 prepare = False
-work_dir = /var/lib/letsencrypt
+work_dir = /var/lib/certbot
 tos = False
 init = False
 http01_port = 80
@@ -68,6 +68,6 @@ apache_init_script = None
 user_agent = None
 apache_le_vhost_ext = -le-ssl.conf
 debug = False
-logs_dir = /var/log/letsencrypt
+logs_dir = /var/log/certbot
 apache_vhost_root = /etc/apache2/sites-available
 configurator = None
diff -Pdpru certbot-0.33.1.orig/certbot/tests/testdata/sample-renewal.conf certbot-0.33.1/certbot/tests/testdata/sample-renewal.conf
--- certbot-0.33.1.orig/certbot/tests/testdata/sample-renewal.conf	2019-04-05 00:24:43.000000000 +0200
+++ certbot-0.33.1/certbot/tests/testdata/sample-renewal.conf	2019-04-06 01:34:20.319960304 +0200
@@ -21,7 +21,7 @@ text_mode = False
 func = <function obtain_cert at 0x7f093a163c08>
 staging = True
 prepare = False
-work_dir = /var/lib/letsencrypt
+work_dir = /var/lib/certbot
 tos = False
 init = False
 http01_port = 80
@@ -68,7 +68,7 @@ apache_init_script = None
 user_agent = None
 apache_le_vhost_ext = -le-ssl.conf
 debug = False
-logs_dir = /var/log/letsencrypt
+logs_dir = /var/log/certbot
 apache_vhost_root = /etc/apache2/sites-available
 configurator = None
 must_staple = True
diff -Pdpru certbot-0.33.1.orig/certbot-apache/certbot_apache/tests/apache-conf-files/passing/finalize-1243.conf certbot-0.33.1/certbot-apache/certbot_apache/tests/apache-conf-files/passing/finalize-1243.conf
--- certbot-0.33.1.orig/certbot-apache/certbot_apache/tests/apache-conf-files/passing/finalize-1243.conf	2019-04-05 00:24:43.000000000 +0200
+++ certbot-0.33.1/certbot-apache/certbot_apache/tests/apache-conf-files/passing/finalize-1243.conf	2019-04-06 01:26:21.217743241 +0200
@@ -41,7 +41,7 @@ Listen 4443
 SSLCertificateFile /etc/ssl/certs/ssl-cert-snakeoil.pem
 SSLCertificateKeyFile /etc/ssl/private/ssl-cert-snakeoil.key
 SSLCertificateChainFile /etc/ssl/certs/ssl-cert-snakeoil.pem
-Include /etc/letsencrypt/options-ssl-apache.conf
+Include /etc/certbot/options-ssl-apache.conf
 
 </VirtualHost>
 
diff -Pdpru certbot-0.33.1.orig/certbot-nginx/certbot_nginx/configurator.py certbot-0.33.1/certbot-nginx/certbot_nginx/configurator.py
--- certbot-0.33.1.orig/certbot-nginx/certbot_nginx/configurator.py	2019-04-05 00:24:43.000000000 +0200
+++ certbot-0.33.1/certbot-nginx/certbot_nginx/configurator.py	2019-04-06 01:36:44.979044448 +0200
@@ -1104,7 +1104,7 @@ def nginx_restart(nginx_ctl, nginx_conf)
     """Restarts the Nginx Server.
 
     .. todo:: Nginx restart is fatal if the configuration references
-        non-existent SSL cert/key files. Remove references to /etc/letsencrypt
+        non-existent SSL cert/key files. Remove references to /etc/certbot
         before restart.
 
     :param str nginx_ctl: Path to the Nginx binary.
diff -Pdpru certbot-0.33.1.orig/certbot-nginx/certbot_nginx/tests/obj_test.py certbot-0.33.1/certbot-nginx/certbot_nginx/tests/obj_test.py
--- certbot-0.33.1.orig/certbot-nginx/certbot_nginx/tests/obj_test.py	2019-04-05 00:24:43.000000000 +0200
+++ certbot-0.33.1/certbot-nginx/certbot_nginx/tests/obj_test.py	2019-04-06 01:36:32.050768826 +0200
@@ -195,9 +195,9 @@ class VirtualHostTest(unittest.TestCase)
             ['index', 'index.html index.htm index.nginx-debian.html'],
             ['server_name', 'two.functorkitten.xyz'], ['listen', '443 ssl'],
             ['#', ' managed by Certbot'],
-            ['ssl_certificate', '/etc/letsencrypt/live/two.functorkitten.xyz/fullchain.pem'],
+            ['ssl_certificate', '/etc/certbot/live/two.functorkitten.xyz/fullchain.pem'],
             ['#', ' managed by Certbot'],
-            ['ssl_certificate_key', '/etc/letsencrypt/live/two.functorkitten.xyz/privkey.pem'],
+            ['ssl_certificate_key', '/etc/certbot/live/two.functorkitten.xyz/privkey.pem'],
             ['#', ' managed by Certbot'],
             ['return', '301', 'https://$host$request_uri'],
             ['#', ' managed by Certbot'], []]
@@ -209,9 +209,9 @@ class VirtualHostTest(unittest.TestCase)
             ['index', 'index.html index.htm index.nginx-debian.html'],
             ['server_name', 'two.functorkitten.xyz'], ['listen', '443 ssl'],
             ['#', ' managed by Certbot'],
-            ['ssl_certificate', '/etc/letsencrypt/live/two.functorkitten.xyz/fullchain.pem'],
+            ['ssl_certificate', '/etc/certbot/live/two.functorkitten.xyz/fullchain.pem'],
             ['#', ' managed by Certbot'],
-            ['ssl_certificate_key', '/etc/letsencrypt/live/two.functorkitten.xyz/privkey.pem'],
+            ['ssl_certificate_key', '/etc/certbot/live/two.functorkitten.xyz/privkey.pem'],
             ['#', ' managed by Certbot'],
             [['if', '($scheme', '!=', '"https")'],
              [['return', '302', 'https://$host$request_uri']]
diff -Pdpru certbot-0.33.1.orig/tests/letstest/multitester.py certbot-0.33.1/tests/letstest/multitester.py
--- certbot-0.33.1.orig/tests/letstest/multitester.py	2019-04-05 00:24:43.000000000 +0200
+++ certbot-0.33.1/tests/letstest/multitester.py	2019-04-06 01:31:06.999838251 +0200
@@ -309,8 +309,8 @@ def install_and_launch_certbot(instance,
 
 def grab_certbot_log():
     "grabs letsencrypt.log via cat into logged stdout"
-    sudo('if [ -f /var/log/letsencrypt/letsencrypt.log ]; then \
-    cat /var/log/letsencrypt/letsencrypt.log; else echo "[novarlog]"; fi')
+    sudo('if [ -f /var/log/certbot/letsencrypt.log ]; then \
+    cat /var/log/certbot/letsencrypt.log; else echo "[novarlog]"; fi')
     # fallback file if /var/log is unwriteable...? correct?
     sudo('if [ -f ./certbot.log ]; then \
     cat ./certbot.log; else echo "[nolocallog]"; fi')
diff -Pdpru certbot-0.33.1.orig/tests/letstest/scripts/test_renew_standalone.sh certbot-0.33.1/tests/letstest/scripts/test_renew_standalone.sh
--- certbot-0.33.1.orig/tests/letstest/scripts/test_renew_standalone.sh	2019-04-05 00:24:43.000000000 +0200
+++ certbot-0.33.1/tests/letstest/scripts/test_renew_standalone.sh	2019-04-06 01:29:17.997513751 +0200
@@ -43,7 +43,7 @@ if [ $? -ne 0 ] ; then
 fi
 
 
-ls /etc/letsencrypt/archive/$PUBLIC_HOSTNAME | grep -q 2.pem
+ls /etc/certbot/archive/$PUBLIC_HOSTNAME | grep -q 2.pem
 
 if [ $? -ne 0 ] ; then
     FAIL=1

Places

File certbot-fix_constants.patch of Package certbot (Revision 03822f5055f34b5222f7b0e23e53d1be)

Places