File certbot-fix_constants.patch of Package certbot

Overview Repositories Revisions Requests Users Attributes Meta

File certbot-fix_constants.patch of Package certbot (Revision 7b993904d83fd9c500c9f13b80c0af6c)

Currently displaying revision 7b993904d83fd9c500c9f13b80c0af6c , Show latest

diff -Pdpru certbot-0.29.1.orig/certbot/compat.py certbot-0.29.1/certbot/compat.py
--- certbot-0.29.1.orig/certbot/compat.py	2018-12-06 01:31:07.000000000 +0100
+++ certbot-0.29.1/certbot/compat.py	2018-12-06 18:02:38.604585118 +0100
@@ -179,9 +179,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',
 }
 
 def get_default_folder(folder_type):
diff -Pdpru certbot-0.29.1.orig/certbot/constants.py certbot-0.29.1/certbot/constants.py
--- certbot-0.29.1.orig/certbot/constants.py	2018-12-06 01:31:07.000000000 +0100
+++ certbot-0.29.1/certbot/constants.py	2018-12-06 18:02:13.015300198 +0100
@@ -17,7 +17,7 @@ CLI_DEFAULTS = dict(
         os.path.join(compat.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.29.1.orig/certbot/tests/cli_test.py certbot-0.29.1/certbot/tests/cli_test.py
--- certbot-0.29.1.orig/certbot/tests/cli_test.py	2018-12-06 01:31:07.000000000 +0100
+++ certbot-0.29.1/certbot/tests/cli_test.py	2018-12-06 18:05:49.337204306 +0100
@@ -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.29.1.orig/certbot-apache/certbot_apache/tests/apache-conf-files/passing/finalize-1243.conf certbot-0.29.1/certbot-apache/certbot_apache/tests/apache-conf-files/passing/finalize-1243.conf
--- certbot-0.29.1.orig/certbot-apache/certbot_apache/tests/apache-conf-files/passing/finalize-1243.conf	2018-12-06 01:31:07.000000000 +0100
+++ certbot-0.29.1/certbot-apache/certbot_apache/tests/apache-conf-files/passing/finalize-1243.conf	2018-12-06 18:04:10.232920873 +0100
@@ -41,7 +41,7 @@ Listen 443
 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>

Places

File certbot-fix_constants.patch of Package certbot (Revision 7b993904d83fd9c500c9f13b80c0af6c)

Places