65 Commits

Author SHA1 Message Date
MrMeeb 2452650b38 Correct detection of missing APPRISE_URL
Test Pull Request / Build Image (pull_request) Successful in 6m8s
Test Pull Request / Notify (pull_request) Successful in 3s
2024-05-30 20:58:57 +00:00
MrMeeb 8c4314e311 Move renewal function to its own file 2024-05-30 20:58:57 +00:00
MrMeeb c16a19d965 Add new env vars to readme 2024-05-30 20:58:57 +00:00
MrMeeb ff11414fa0 Add support for alerting on success or failure of renewal
Installs apprise and allows config of alerting for successful or failed renewals. Currently only supports renewals, not inital issuing. Not necessarily a problem as I'd hope you'd be watching the logs on first run.
I don't love how I create /config/.renew-list.sh. I should readdress this somehow
2024-05-30 20:58:57 +00:00
MrMeeb 1dce5880f3 Move to Feature Branch Workflow [skip ci] (#23)
Change branch method for [Feature Branch](https://www.atlassian.com/git/tutorials/comparing-workflows/feature-branch-workflow) workflow. Gitflow workflow is overkill for my needs.

Reviewed-on: #23
Co-authored-by: MrMeeb <charles.macdonald@me.com>
Co-committed-by: MrMeeb <charles.macdonald@me.com>
2024-05-30 20:55:47 +00:00
MrMeeb 98194ed52c Merge pull request 'Update alpine Docker tag to v3.20.0' (#19) from renovate/alpine-3.x into master
Build Image / Publish Image (push) Has been cancelled
Build Image / Notify (push) Has been cancelled
Build Image / Validate Image (push) Has been cancelled
Reviewed-on: #19
2024-05-29 17:01:13 +00:00
MrMeeb 47ca53287e Add setuptools for certbot dependencies
Test Pull Request / Build Image (pull_request) Successful in 4m8s
Test Pull Request / Notify (pull_request) Successful in 4s
2024-05-29 16:35:00 +00:00
renovate-bot f93f798cde Update alpine Docker tag to v3.20.0
Test Pull Request / Notify (pull_request) Has been skipped
Test Pull Request / Build Image (pull_request) Failing after 1m36s
2024-05-27 22:46:33 +00:00
MrMeeb 452413c3d1 Revert c12eb0b381 (#18)
Build Image / Validate Image (push) Successful in 1m42s
Build Image / Publish Image (push) Successful in 4m15s
Build Image / Notify (push) Successful in 3s
Reviewed-on: #18
2024-05-27 22:30:03 +00:00
MrMeeb 798f82c110 revert c12eb0b381
Test Pull Request / Build Image (pull_request) Successful in 3m57s
Test Pull Request / Notify (pull_request) Successful in 3s
revert Update alpine Docker tag to v3.20.0
2024-05-27 22:24:29 +00:00
renovate-bot b3aa822da3 Update certbot to v2.10.0
Build Image / Validate Image (push) Successful in 2m16s
Build Image / Publish Image (push) Failing after 1m15s
Build Image / Notify (push) Has been skipped
2024-05-27 22:12:33 +00:00
renovate-bot c12eb0b381 Update alpine Docker tag to v3.20.0
Test Pull Request / Build Image (pull_request) Failing after 1m21s
Test Pull Request / Notify (pull_request) Has been skipped
Build Image / Validate Image (push) Successful in 1m30s
Build Image / Publish Image (push) Failing after 1m17s
Build Image / Notify (push) Has been skipped
2024-05-27 22:07:58 +00:00
MrMeeb 48f1281ba6 Fix incorrect reference to default branch (#17)
Build Image / Validate Image (push) Successful in 54s
Build Image / Publish Image (push) Successful in 4m28s
Build Image / Notify (push) Successful in 3s
Reviewed-on: #17
2024-05-27 22:01:48 +00:00
MrMeeb 1d5a66a385 Fix incorrect reference to default branch
Test Pull Request / Build Image (pull_request) Successful in 4m1s
Test Pull Request / Notify (pull_request) Successful in 3s
Build Image / Publish Image (push) Has been cancelled
Build Image / Notify (push) Has been cancelled
Build Image / Validate Image (push) Has been cancelled
2024-05-27 20:53:20 +00:00
MrMeeb df3fc81a9d Update base renovate branch 2024-05-27 15:57:57 +00:00
MrMeeb 2a41f240a3 Merge pull request 'Add automations and bump base versions' (#11) from develop into master
Build Image / Publish Image (push) Has been cancelled
Build Image / Notify (push) Has been cancelled
Build Image / Validate Image (push) Has been cancelled
Reviewed-on: #11
2024-05-12 11:40:44 +00:00
MrMeeb 1b8831b888 Correct build-main workflow
Build Image / Validate Image (push) Successful in 1m40s
Build Image / Publish Image (push) Successful in 4m17s
Build Image / Notify (push) Successful in 3s
2024-05-12 11:33:34 +00:00
MrMeeb 295c554933 Merge branch 'automation' into develop
Build Image / Validate Image (push) Failing after 1m57s
Build Image / Publish Image (push) Has been skipped
Build Image / Notify (push) Has been skipped
2024-05-12 11:30:13 +00:00
MrMeeb d02cf72bbc Correct workflow dependency graph 2024-05-12 11:22:16 +00:00
MrMeeb 5d3eed683d Add gitea actions
Build Image / Validate Image (push) Successful in 2m19s
Build Image / Notify (push) Successful in 3s
Build Image / Publish Image (push) Successful in 4m13s
2024-05-12 11:00:57 +00:00
MrMeeb 0157a462ed Remove Drone build badges 2024-05-12 10:58:19 +00:00
MrMeeb 63f586768f Add gitea actions 2024-05-12 10:57:43 +00:00
MrMeeb 5863d5b808 Change release formatting 2024-05-12 09:25:01 +00:00
MrMeeb c42462b4e1 Update goreleaser syntax 2024-05-12 09:24:53 +00:00
MrMeeb 3db15537e8 Rebase to Alpine 3.19.1 2024-05-12 09:22:25 +00:00
MrMeeb 9465157295 Update S6 to 3.1.6.2 2024-05-12 09:22:08 +00:00
MrMeeb 8d36f0c117 Version control for Certbot packages 2024-05-12 09:21:44 +00:00
MrMeeb b574ae146e Enable Renovate 2024-05-12 09:21:23 +00:00
MrMeeb 0eeb08f4d8 Update README.md [CI SKIP] 2024-01-13 17:30:08 +00:00
MrMeeb 639120e46d Update README.md [CI SKIP] 2024-01-13 17:28:19 +00:00
MrMeeb 75488a4009 Merge pull request '1.1.2' (#7) from develop into master
continuous-integration/drone/push Build is passing
continuous-integration/drone/tag Build is passing
Reviewed-on: #7
2023-08-02 11:54:14 +00:00
MrMeeb b962b65145 add ONE_SHOT so container exits after run
continuous-integration/drone/push Build is passing
2023-07-17 17:49:02 +00:00
MrMeeb 0614aa0565 fix build issues due to cython 3.0.0 release 2023-07-17 17:19:30 +00:00
MrMeeb 83f8c39e48 Merge pull request '1.1.1' (#6) from develop into master
continuous-integration/drone/push Build is passing
continuous-integration/drone/tag Build is passing
Reviewed-on: #6
2023-07-16 18:07:08 +00:00
MrMeeb 961f218621 further small tweak to log formatting
continuous-integration/drone/push Build is passing
2023-07-16 17:39:48 +00:00
MrMeeb 6134b05328 Merge pull request '1.1.0' (#5) from develop into master
continuous-integration/drone/push Build is passing
continuous-integration/drone/tag Build is passing
Reviewed-on: #5
2023-07-16 17:08:41 +00:00
MrMeeb ada326f2d8 tweak log formatting
continuous-integration/drone/push Build is passing
2023-07-16 16:45:36 +00:00
MrMeeb 5d14d166eb add multi-certificate support
continuous-integration/drone/push Build is passing
2023-07-16 15:37:12 +00:00
MrMeeb 3a6466612b enable tracking of env vars between runs
continuous-integration/drone/push Build is passing
2023-07-15 16:04:45 +00:00
MrMeeb 36b71a0ebb add standalone and webroot methods
continuous-integration/drone/push Build is passing
2023-07-09 21:53:06 +00:00
MrMeeb e0da513893 Merge pull request '1.0.0' (#4) from develop into master
continuous-integration/drone/push Build is passing
continuous-integration/drone/tag Build is passing
Reviewed-on: #4
2023-06-21 18:20:15 +00:00
MrMeeb df56fcf997 make CLOUDFLARE_TOKEN override instead of append
continuous-integration/drone/push Build is passing
2023-06-21 17:48:29 +00:00
MrMeeb 3c3cc47d32 add CLOUDFLARE_TOKEN to env vars
continuous-integration/drone/push Build is passing
2023-06-21 17:32:17 +00:00
MrMeeb 053cef4c31 add build dependencies for arm
continuous-integration/drone/push Build is passing
2023-06-20 22:14:44 +00:00
MrMeeb b6d93c1164 update readme
continuous-integration/drone/push Build is failing
2023-06-20 21:27:42 +00:00
MrMeeb a41c409f9d update build logic 2023-06-20 21:27:36 +00:00
MrMeeb e859aa7218 add goreleaser 2023-06-20 21:27:27 +00:00
MrMeeb a4b59c360e change to s6 2023-06-20 21:27:01 +00:00
MrMeeb e7bd87d5bd change to alpine 2023-06-20 21:26:11 +00:00
MrMeeb 6ef0abfd6b Update 'README.md'
continuous-integration/drone/push Build is passing
2023-01-02 16:40:31 +00:00
MrMeeb 868eb4eb59 Update '.drone.yml'
continuous-integration/drone/push Build is passing
2022-12-25 20:38:20 +00:00
MrMeeb 578284bb10 Update '.drone.yml'
continuous-integration/drone/push Build is passing
2022-12-25 19:18:06 +00:00
MrMeeb e10bdd741d Update 'README.md' 2022-12-25 19:09:13 +00:00
MrMeeb 0aa35c3ef6 Update 'README.md' 2022-12-25 19:07:54 +00:00
MrMeeb 90f5095eef Add '.drone.yml' 2022-12-25 18:50:54 +00:00
MrMeeb 3daee369ca Update 'README.md' 2022-12-25 18:48:33 +00:00
MrMeeb 6a27c9232c Update 'README.md' 2022-06-21 16:56:35 +00:00
MrMeeb e130fc041e Prevented dhparams regenerating if they already exist 2022-06-21 11:58:46 +00:00
MrMeeb 591e35c91a Formatting 2022-06-20 22:42:29 +00:00
MrMeeb 375cf5da74 Add GENERATE_DHPARAM 2022-06-20 22:41:27 +00:00
MrMeeb 09eb18adda Added PROPOGATION_TIME variable 2022-06-20 22:08:30 +00:00
MrMeeb d09988c241 Update 'README.md' 2022-06-19 17:11:20 +00:00
MrMeeb 6d696dd4b2 Fix typo 2022-06-18 23:12:11 +00:00
MrMeeb c23657ce01 Formatting fix 2022-06-18 23:10:07 +00:00
MrMeeb 634f0cac4a first commit 2022-06-18 23:08:39 +00:00
8 changed files with 10 additions and 44 deletions
+3 -3
View File
@@ -1,4 +1,4 @@
FROM alpine:3.21.2 AS base FROM alpine:3.20.0 as base
ARG TARGETARCH ARG TARGETARCH
FROM base AS base-amd64 FROM base AS base-amd64
@@ -9,7 +9,7 @@ ENV S6_OVERLAY_ARCH=aarch64
FROM base-${TARGETARCH}${TARGETVARIANT} FROM base-${TARGETARCH}${TARGETVARIANT}
ARG S6_OVERLAY_VERSION="3.2.0.2" ARG S6_OVERLAY_VERSION="3.1.6.2"
# Core variables # Core variables
ENV PUID=1000 ENV PUID=1000
@@ -40,7 +40,7 @@ ENV CLOUDFLARE_TOKEN=
ENV CERT_COUNT=1 ENV CERT_COUNT=1
#Get required packages #Get required packages
RUN apk update && apk add curl bash python3 py3-virtualenv procps tzdata nano shadow xz busybox-suid openssl logrotate RUN apk update && apk add curl bash python3 py3-virtualenv procps tzdata nano shadow xz busybox-suid openssl
#Make folders #Make folders
RUN mkdir /config && \ RUN mkdir /config && \
-1
View File
@@ -4,7 +4,6 @@
"major": { "major": {
"dependencyDashboardApproval": true "dependencyDashboardApproval": true
}, },
"minimumReleaseAge": "7 days",
"customManagers": [ "customManagers": [
{ {
"customType": "regex", "customType": "regex",
+3 -3
View File
@@ -1,5 +1,5 @@
# For pinning Python packages to then be parsed by Renovate # For pinning Python packages to then be parsed by Renovate
certbot ==3.1.0 certbot ==2.10.0
certbot-dns-cloudflare ==3.1.0 certbot-dns-cloudflare ==2.10.0
apprise ==1.9.2 apprise ==1.8.0
+1 -2
View File
@@ -786,8 +786,7 @@ if [ $ONE_SHOT == "true" ]; then
elif [ $ONE_SHOT == "false" ]; then elif [ $ONE_SHOT == "false" ]; then
echo "$INTERVAL /config/.renew-list.sh >> /config/logs/renew.log echo "$INTERVAL /config/.renew-list.sh >> /config/logs/renew.log" > /config/.crontab.txt
0 0 * * * logrotate -v --state /config/logs/logrotate.status /logrotate.conf" > /config/.crontab.txt
echo "" echo ""
+1 -2
View File
@@ -4,7 +4,6 @@
if [ $ONE_SHOT == "true" ]; then if [ $ONE_SHOT == "true" ]; then
# Cleanly kill container by sending kill signal to supervisor process # Cleanly kill container by sending kill signal to supervisor process
echo 0 > /run/s6-linux-init-container-results/exitcode kill 1
/run/s6/basedir/bin/halt
fi fi
-8
View File
@@ -1,9 +1 @@
#!/command/with-contenv bash
# shellcheck shell=bash
if [ $ONE_SHOT == "false" ]; then
# Export exit code if not a ONE_SHOT
echo "$e" > /run/s6-linux-init-container-results/exitcode echo "$e" > /run/s6-linux-init-container-results/exitcode
fi
-8
View File
@@ -1,9 +1 @@
#!/command/with-contenv bash
# shellcheck shell=bash
if [ $ONE_SHOT == "false" ]; then
# Export exit code if not a ONE_SHOT
echo "$e" > /run/s6-linux-init-container-results/exitcode echo "$e" > /run/s6-linux-init-container-results/exitcode
fi
-15
View File
@@ -1,15 +0,0 @@
missingok
/config/logs/letsencrypt.log {
daily
rotate 10
postrotate
find /config/logs -type f -regex '.*letsencrypt\.log\.\(.[2-9]\|[2-9].\|[1-9][0-9]\{2,\}\).*' -delete
endscript
}
/config/logs/renew.log {
rotate 5
size 100k
compress
}