From 1b270451b2a1cef67048cec24517fb32b9c25d06 Mon Sep 17 00:00:00 2001 From: Jakub Warmuz Date: Tue, 9 Dec 2014 22:25:01 +0100 Subject: [PATCH 1/4] virtualenv python2 (fixes #120) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 109da63de..a59aa7c8d 100644 --- a/README.md +++ b/README.md @@ -46,7 +46,7 @@ sudo apt-get install python python-setuptools python-virtualenv \ ### Installation ``` -virtualenv --no-site-packages venv +virtualenv --no-site-packages -p python2 venv ./venv/bin/python setup.py install sudo ./venv/bin/letsencrypt ``` From 5e05638fefe7ad6b4e850891853c56cd0ec6ac49 Mon Sep 17 00:00:00 2001 From: Jakub Warmuz Date: Wed, 17 Dec 2014 08:14:35 +0100 Subject: [PATCH 2/4] Add client.tests to setup packages --- setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.py b/setup.py index 24ff3752d..8a473ebb4 100755 --- a/setup.py +++ b/setup.py @@ -35,6 +35,7 @@ setup( packages=[ 'letsencrypt', 'letsencrypt.client', + 'letsencrypt.client.tests', 'letsencrypt.scripts', ], install_requires=install_requires, From 6d0d439acf0c4a45f623afc8f8f026f230e8119b Mon Sep 17 00:00:00 2001 From: James Kasten Date: Wed, 17 Dec 2014 19:23:43 -0800 Subject: [PATCH 3/4] Fix #137 find_directive uses the unitialized member location in set_user_config when httpd.conf is present. I changed set_user_config_file to use the root path as a start. --- letsencrypt/client/apache_configurator.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/letsencrypt/client/apache_configurator.py b/letsencrypt/client/apache_configurator.py index 11a999e9b..2a2f77812 100644 --- a/letsencrypt/client/apache_configurator.py +++ b/letsencrypt/client/apache_configurator.py @@ -352,7 +352,7 @@ class ApacheConfigurator(augeas_configurator.AugeasConfigurator): """ root = self._find_config_root() - default = self._set_user_config_file() + default = self._set_user_config_file(root) temp = os.path.join(self.server_root, "ports.conf") if os.path.isfile(temp): @@ -376,7 +376,7 @@ class ApacheConfigurator(augeas_configurator.AugeasConfigurator): raise errors.LetsEncryptConfiguratorError( "Could not find configuration root") - def _set_user_config_file(self, filename=''): + def _set_user_config_file(self, root, filename=''): """Set the appropriate user configuration file .. todo:: This will have to be updated for other distros versions @@ -393,7 +393,8 @@ class ApacheConfigurator(augeas_configurator.AugeasConfigurator): # httpd.conf was very common as a user file in Apache 2.2 if (os.path.isfile(self.server_root + 'httpd.conf') and self.find_directive( - case_i("Include"), case_i("httpd.conf"))): + case_i("Include"), case_i("httpd.conf"), + get_aug_path(root))): return os.path.join(self.server_root, 'httpd.conf') else: return os.path.join(self.server_root + 'apache2.conf') From e2957797b56b1000b7a6696b6f2cff3160068a1b Mon Sep 17 00:00:00 2001 From: Francois Marier Date: Sun, 21 Dec 2014 14:23:14 +1300 Subject: [PATCH 4/4] Fix the sh path and make script executable --- letsencrypt/client/setup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) mode change 100644 => 100755 letsencrypt/client/setup.sh diff --git a/letsencrypt/client/setup.sh b/letsencrypt/client/setup.sh old mode 100644 new mode 100755 index fb35eb4f7..9db81cbd2 --- a/letsencrypt/client/setup.sh +++ b/letsencrypt/client/setup.sh @@ -1,2 +1,2 @@ -#!/usr/bin/sh +#!/bin/sh cp options-ssl.conf /etc/letsencrypt/options-ssl.conf