diff --git a/README.rst b/README.rst index 2a45244..f61a124 100644 --- a/README.rst +++ b/README.rst @@ -421,3 +421,20 @@ run: Since pip is part of ``python-setuptools``, you need to have it installed before you can update. + +Making a `.deb` debian package +------------------------------ + +Run the following commands in your vagrant machine: + +``` + apt-file update + python setup.py sdist + # py2dsc has a problem with vbox mounted folders + mv dist/certbot-haproxy-.tar.gz ~ + cd ~ + py2dsc certbot-haproxy-.tar.gz + cd deb_dist/certbot-haproxy- + # NOTE: Not signed, no signed changes (with -uc and -us) + dpkg-buildpackage -rfakeroot -uc -us +``` diff --git a/greenhost.patch b/greenhost.patch index aa129de..79a1e6f 100644 --- a/greenhost.patch +++ b/greenhost.patch @@ -65,10 +65,7 @@ diff --git a/test/test-ca.key-pkcs11.json b/test/test-ca.key-pkcs11.json index 7a8d348..746dee8 100644 --- a/test/test-ca.key-pkcs11.json +++ b/test/test-ca.key-pkcs11.json -@@ -1,5 +1,5 @@ +@@ -1,2 +1,2 @@ { - "module": "/usr/local/lib/libpkcs11-proxy.so", + "module": "/usr/lib/softhsm/libsofthsm.so", - "tokenLabel": "intermediate", - "pin": "5678", - "privateKeyLabel": "intermediate_key" diff --git a/provisioning_server.sh b/provisioning_server.sh index 5ee1d9f..3a4933b 100644 --- a/provisioning_server.sh +++ b/provisioning_server.sh @@ -5,7 +5,9 @@ dpkg-reconfigure -f noninteractive tzdata export DEBIAN_FRONTEND="noninteractive" # Install go 1.5 -wget -q https://storage.googleapis.com/golang/go1.5.linux-amd64.tar.gz +if [ ! -f go1.5.linux-amd64.tar.gz ]; then + wget -q https://storage.googleapis.com/golang/go1.5.linux-amd64.tar.gz +fi tar -C /usr/local -xzf go1.5.linux-amd64.tar.gz # Set GOROOT and GOPATH so that GO knows where it is and where it can install @@ -118,7 +120,7 @@ server { } EOF -ln -s /etc/nginx/sites-available/wfe /etc/nginx/sites-enabled/wfe +ln -fs /etc/nginx/sites-available/wfe /etc/nginx/sites-enabled/wfe rm -rfv /etc/nginx/sites-enabled/default systemctl restart nginx diff --git a/setup.py b/setup.py index d90a8a7..7ed9a24 100644 --- a/setup.py +++ b/setup.py @@ -3,7 +3,7 @@ import sys from setuptools import setup from setuptools import find_packages - +own_version = '0.1.0' certbot_version = '0.8.1' # Please update tox.ini when modifying dependency version requirements @@ -15,6 +15,7 @@ install_requires = [ 'setuptools>=1.0', 'zope.component', 'zope.interface', + 'future', ] if sys.version_info < (2, 7): @@ -42,7 +43,7 @@ haproxy_installer = 'certbot_haproxy.installer:HAProxyInstaller' setup( name='certbot-haproxy', - version=certbot_version, + version=own_version, description="HAProxy plugin for Certbot", long_description=long_description, url='https://code.greenhost.net/open/certbot-haproxy',