diff options
| author | ohemorange <ebportnoy@gmail.com> | 2020-06-10 23:52:56 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-10 23:52:56 +0300 |
| commit | 8d776fb7acd34caa19c6c662244452dd8f6335b4 (patch) | |
| tree | 9608645bc235bda966e50c8ec1d26ee935c0dfee /snap | |
| parent | 50fa04ba0cb739eb0eafec2286cb08d9caae1b16 (diff) | |
Make Certbot find externally snapped plugins (#8054)
* Add snap plugin support
Switch to a PoC branch of certbot that supports the new
CERTBOT_PLUGIN_PATH and wrap the snap to set this variable correctly
based on the content interfaces connected.
(cherry picked from commit 7076a55fd82116d068e2aca7239209b7203917d2)
* Modify certbot.wrapper to append to PYTHONPATH instead of separate CERTBOT_PLUGIN_PATH variable
* Update certbot-wrapper to python3.6 version
* add source field
* Update changelog
* Use bash instead of sh
Co-authored-by: Brad Warren <bmw@users.noreply.github.com>
* Exit if something goes wrong
Co-authored-by: Brad Warren <bmw@users.noreply.github.com>
* No leading : when modifying empty PYTHONPATH
* Improve bash handling of PYTHONPATH manipulation
Co-authored-by: Robie Basak <robie.basak@canonical.com>
Co-authored-by: Brad Warren <bmw@eff.org>
Co-authored-by: Brad Warren <bmw@users.noreply.github.com>
Diffstat (limited to 'snap')
| -rw-r--r-- | snap/snapcraft.yaml | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 07910bf0d..fd5b908f6 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -7,7 +7,7 @@ description: | browser-trusted certificate, without any human intervention. This is accomplished by running a certificate management agent on the web server. - + This agent is used to: - Automatically prove to the Let's Encrypt CA that you control the website - Obtain a browser-trusted certificate and set it up on your web server @@ -20,7 +20,7 @@ adopt-info: certbot apps: certbot: - command: certbot + command: certbot.wrapper environment: PATH: "$SNAP/bin:$SNAP/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games" AUGEAS_LENS_LIB: "$SNAP/usr/share/augeas/lenses/dist" @@ -85,6 +85,10 @@ parts: # After certbot-apache to not rebuild duplicates (essentially sharing what was already staged, # like zope) after: [certbot-apache] + wrappers: + plugin: dump + source: . + stage: [certbot.wrapper] plugs: plugin: |