File certbot-fix_constants.patch of Package certbot

Overview Repositories Revisions Requests Users Attributes Meta

File certbot-fix_constants.patch of Package certbot (Revision d7405a8ad61a4fe0288b58d5423f17ff)

Currently displaying revision d7405a8ad61a4fe0288b58d5423f17ff , Show latest

Index: certbot-0.31.0/certbot/compat.py
===================================================================
--- certbot-0.31.0.orig/certbot/compat.py
+++ certbot-0.31.0/certbot/compat.py
@@ -183,9 +183,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',
 }
 
 
Index: certbot-0.31.0/certbot/constants.py
===================================================================
--- certbot-0.31.0.orig/certbot/constants.py
+++ certbot-0.31.0/certbot/constants.py
@@ -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
Index: certbot-0.31.0/certbot/tests/cli_test.py
===================================================================
--- certbot-0.31.0.orig/certbot/tests/cli_test.py
+++ certbot-0.31.0/certbot/tests/cli_test.py
@@ -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
Index: certbot-0.31.0/certbot-apache/certbot_apache/tests/apache-conf-files/passing/finalize-1243.conf
===================================================================
--- certbot-0.31.0.orig/certbot-apache/certbot_apache/tests/apache-conf-files/passing/finalize-1243.conf
+++ certbot-0.31.0/certbot-apache/certbot_apache/tests/apache-conf-files/passing/finalize-1243.conf
@@ -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 d7405a8ad61a4fe0288b58d5423f17ff)

Places