From 3888bc8f2ab39dca00b83deafab904cbe4aa8708 Mon Sep 17 00:00:00 2001 From: Adrien Ferrand Date: Mon, 13 May 2019 22:55:22 +0200 Subject: [PATCH] Revert " Add FreeBSD specific paths (#6702)" (#7056) Revert #6702 After some discussions, we realized that changing the path for FreeBSD users, if it corresponds to the path used when Certbot is installed using ports, will break for users that installed it through certbot-auto. Indeed in this case, the path used was the one for Linux. After #6702, Certbot would not find anymore the existing config path by default. It would require, to be integrated, a proper documentation and a migration path. For now, it is preferable to revert it. This reverts commit 7fe82cf1ac4c6e40ab4a21a5a8822db200cb28ad. --- CHANGELOG.md | 1 - certbot/compat/misc.py | 10 +--------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e7abdfcee..ac7f34a09 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,6 @@ Certbot adheres to [Semantic Versioning](https://semver.org/). ### Added -* Add FreeBSD specific paths to certbot * ### Changed diff --git a/certbot/compat/misc.py b/certbot/compat/misc.py index b22fa93e8..4f0e22078 100644 --- a/certbot/compat/misc.py +++ b/certbot/compat/misc.py @@ -129,11 +129,7 @@ LINUX_DEFAULT_FOLDERS = { 'work': '/var/lib/letsencrypt', 'logs': '/var/log/letsencrypt', } -FREEBSD_DEFAULT_FOLDERS = { - 'config': '/usr/local/etc/letsencrypt', - 'work': '/var/db/letsencrypt', - 'logs': '/var/log/letsencrypt', -} + def get_default_folder(folder_type): """ @@ -146,10 +142,6 @@ def get_default_folder(folder_type): """ if os.name != 'nt': - # Unix-like - if sys.platform.startswith('freebsd') or sys.platform.startswith('dragonfly'): - # FreeBSD specific - return FREEBSD_DEFAULT_FOLDERS[folder_type] # Linux specific return LINUX_DEFAULT_FOLDERS[folder_type] # Windows specific