From 369c18ebb787e4e7e0461a9b0c0a8600b7d21aca Mon Sep 17 00:00:00 2001 From: Erica Portnoy Date: Mon, 13 Jul 2020 15:20:47 -0700 Subject: [PATCH] just do it with main connection --- certbot-dns-dnsimple/snap/hooks/post-refresh | 2 -- certbot-dns-dnsimple/snap/hooks/pre-refresh | 3 --- snap/hooks/prepare-plug-plugin | 1 - 3 files changed, 6 deletions(-) diff --git a/certbot-dns-dnsimple/snap/hooks/post-refresh b/certbot-dns-dnsimple/snap/hooks/post-refresh index 4e91ca9a9..1b48f6b34 100644 --- a/certbot-dns-dnsimple/snap/hooks/post-refresh +++ b/certbot-dns-dnsimple/snap/hooks/post-refresh @@ -1,10 +1,8 @@ #!/bin/sh -e cb_version="$(snapctl get internal-certbot-version)" -cb_version_2="$(snapctl get internal-certbot-version-2)" echo "post cb_version $cb_version" -echo "post cb_version_2 $cb_version_2" # get certbot version # cb_installed="$(snapctl get cb-installed)" diff --git a/certbot-dns-dnsimple/snap/hooks/pre-refresh b/certbot-dns-dnsimple/snap/hooks/pre-refresh index 20e64102e..019a51447 100644 --- a/certbot-dns-dnsimple/snap/hooks/pre-refresh +++ b/certbot-dns-dnsimple/snap/hooks/pre-refresh @@ -1,12 +1,9 @@ #!/bin/sh -e cb_version="$(snapctl get :certbot certbot-version)" -cb_version_2="$(snapctl get :certbot-version certbot-version)" snapctl set internal-cb-version=$cb_version -snapctl set internal-cb-version_2=$cb_version_2 echo "pre cb_version $cb_version" -echo "pre cb_version_2 $cb_version_2" # first_install="$(snapctl get first-install)" # if [ -z "$first_install" ]; then diff --git a/snap/hooks/prepare-plug-plugin b/snap/hooks/prepare-plug-plugin index c94cdb7c3..075bdad17 100644 --- a/snap/hooks/prepare-plug-plugin +++ b/snap/hooks/prepare-plug-plugin @@ -4,7 +4,6 @@ if [ "$(snapctl get trust-plugin-with-root)" = "ok" ]; then # allow the connection, but reset config to allow for other slots to go through this auth flow snapctl unset trust-plugin-with-root snapctl set :plugin certbot-version="test1" - snapctl set :certbot-version certbot-version="test2" exit 0 else echo "Only connect this interface if you trust the plugin author to have root on the system"