diff options
| author | terminaldweller <thabogre@gmail.com> | 2023-03-14 15:01:22 +0000 |
|---|---|---|
| committer | terminaldweller <thabogre@gmail.com> | 2023-03-14 15:01:22 +0000 |
| commit | 75a7e3490715d2fe7dc2ce2fd91724ff2ea9cbfc (patch) | |
| tree | 3cc1594c24fe4e847945ddc8577ff016a7cfab94 | |
| parent | golang lint fixes (diff) | |
| download | hived-75a7e3490715d2fe7dc2ce2fd91724ff2ea9cbfc.tar.gz hived-75a7e3490715d2fe7dc2ce2fd91724ff2ea9cbfc.zip | |
we no longer need to change the cert names manually
| -rw-r--r-- | arbiter/arbiter.go | 4 | ||||
| -rw-r--r-- | docker-compose.yaml | 6 | ||||
| -rw-r--r-- | hived/hived.go | 4 |
3 files changed, 8 insertions, 6 deletions
diff --git a/arbiter/arbiter.go b/arbiter/arbiter.go index 9edf68a..a9ce43d 100644 --- a/arbiter/arbiter.go +++ b/arbiter/arbiter.go @@ -499,8 +499,8 @@ func startServer(gracefulWait time.Duration, switch os.Getenv(serverDeploymentType) { case "deployment": - certPath = "/certs/fullchain1.pem" - keyPath = "/certs/privkey1.pem" + certPath = "/etc/letsencrypt/live/api.terminaldweller.com/fullchain.pem" + keyPath = "/etc/letsencrypt/live/api.terminaldweller.com/privkey.pem" case "test": certPath = "/certs/server.cert" keyPath = "/certs/server.key" diff --git a/docker-compose.yaml b/docker-compose.yaml index 25245d4..4bcec7d 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -19,7 +19,8 @@ services: - telebot entrypoint: ["/hived/docker-entrypoint.sh"] volumes: - - /etc/letsencrypt/archive/api.terminaldweller.com/:/certs/ + - /etc/letsencrypt/live/api.terminaldweller.com/fullchain.pem:/etc/letsencrypt/live/api.terminaldweller.com/fullchain.pem + - /etc/letsencrypt/live/api.terminaldweller.com/privkey.pem:/etc/letsencrypt/live/api.terminaldweller.com/privkey.pem cap_drop: - ALL environment: @@ -61,7 +62,8 @@ services: - "8009:8009" entrypoint: ["/arbiter/arbiter"] volumes: - - /etc/letsencrypt/archive/api.terminaldweller.com/:/certs/ + - /etc/letsencrypt/live/api.terminaldweller.com/fullchain.pem:/etc/letsencrypt/live/api.terminaldweller.com/fullchain.pem + - /etc/letsencrypt/live/api.terminaldweller.com/privkey.pem:/etc/letsencrypt/live/api.terminaldweller.com/privkey.pem cap_drop: - ALL environment: diff --git a/hived/hived.go b/hived/hived.go index 42fb3b0..fccefc7 100644 --- a/hived/hived.go +++ b/hived/hived.go @@ -822,8 +822,8 @@ func startServer(gracefulWait time.Duration, flagPort string) { switch os.Getenv(serverDeploymentType) { case "deployment": - certPath = "/certs/fullchain1.pem" - keyPath = "/certs/privkey1.pem" + certPath = "/etc/letsencrypt/live/api.terminaldweller.com/fullchain.pem" + keyPath = "/etc/letsencrypt/live/api.terminaldweller.com/privkey.pem" case "test": certPath = "/certs/server.cert" keyPath = "/certs/server.key" |