98a7a01dbb
haproxy: deploy script can add a new certificate over the stats socket
...
DEPLOY_HAPROXY_HOT_UPDATE="yes" now allows to add a new certificate
within HAProxy instead of updating an existing one.
In order to work, the ${DEPLOY_HAPROXY_PEM_PATH} value must be used as a
parameter to the "crt" keyword in the haproxy configuration.
The patch uses the following commands over HAProxy stats socket:
- show ssl cert
- new ssl cert
- set ssl cert
- commit ssl cert
- add ssl crt-list
2023-11-30 14:00:44 +01:00
0f7be90500
haproxy: deploy script can update existing certificate over stats socket
...
Since version 2.2, HAProxy is able to update dynamically certificates,
without a reload.
This patch uses socat to push the certificate into HAProxy in order to
achieve hot update. With this method, reloading is not required.
This should be used only to update an existing certificate in haproxy.
2 new variables are available:
- DEPLOY_HAPROXY_HOT_UPDATE="yes" update over the stats socket instead
of reloading
- DEPLOY_HAPROXY_STATS_SOCKET="UNIX:/run/haproxy/admin.sock" set the path on
the stats socket.
2023-11-30 14:00:44 +01:00
7aaf4432d4
haproxy: sanitize the PEM in the deploy script
...
Sanitize the PEM of the haproxy deploy script by removing the '\n', this
way it could be injected directly over the CLI.
2023-11-30 14:00:41 +01:00
884a8995b4
Merge pull request #4853 from Max13/deploy/proxmoxve
...
Fix typo in proxmoxve deploy hook
2023-11-22 09:19:51 +01:00
00dbc3881f
Fixed variables
2023-11-01 20:02:16 +01:00
8ca5ca6594
Update haproxy.sh
...
resolved issue with HAProxy https://github.com/acmesh-official/acme.sh/issues/4788
according https://serversforhackers.com/c/letsencrypt-with-haproxy
2023-10-24 16:58:47 +03:00
ed72b090af
deploy hook for Ruckus ZoneDirector / Unleashed
2023-10-18 20:32:39 -07:00
87a7bde618
fix: Synology DSM API path regex
...
Fix the regex for looking up the API path value from the Synology API query.
2023-09-25 18:43:01 +03:00
29b2960805
Optimze comment & remove tail space
2023-09-07 15:01:37 +08:00
f7f3a0bf0d
Merge branch 'dev' into syno-patch
2023-09-07 14:57:53 +08:00
b793dbf977
Fix device ID property name for DSM 6
2023-08-11 17:55:45 +02:00
d52b38777a
Fix Auth API access for DSM 6
2023-08-09 19:52:37 +02:00
ba468bb5e4
Fix for shfmt check
2023-07-20 13:38:36 +08:00
cf86d57a9f
Fix for shfmt check
2023-07-20 13:34:57 +08:00
9e958f4e32
Fix shellcheck
2023-07-20 13:09:21 +08:00
c7f6f20c9d
Add SYNO_USE_TEMP_ADMIN variable & Fix broken logic
...
1. Fix the broken logic in (Sorry for including fix commit in same PR, I'm feeling quite tired and would like to go to sleep right away...)
2. Provides new method to obtain credential info for authentication, it will create a temp admin user if SYNO_USE_TEMP_ADMIN is set, instead of requiring the user's own credentials which will be saved in disk.
I do really don't like to have plaintext credentials be saved in disk, and I noticed that you've spent a lot of time fighting with 2FA related stuffs, so why not just get rid of the whole old way. :)
2023-07-20 02:48:29 +08:00
1984f44ffe
Shell formatting
2023-07-18 20:18:12 +00:00
02de281e40
Removed unused variable
2023-07-18 20:15:46 +00:00
ae035deb92
Fixed shell check errors
2023-07-18 20:10:31 +00:00
edd1b60c3d
Removed ability to specify API key to facilitate future multiple host functionality.
2023-07-18 19:43:47 +00:00
62a2ce1d35
Merge remote-tracking branch 'upstream/dev' into panos-ecc-fix
2023-07-12 00:22:03 +00:00
b556908cab
Modified ECC file test
2023-07-12 00:03:21 +00:00
e69a19db5c
Incorporated partial commit to address issue #4198
2023-07-11 23:56:41 +00:00
d86414febb
Excluded scopes for api key test
2023-07-11 23:41:24 +00:00
832318fab1
Merge remote-tracking branch 'upstream/master' into panos-ecc-fix
2023-07-11 20:25:43 +00:00
0d7b831661
Fix variable initialization
2023-07-04 16:58:14 +02:00
0c9e4f67a8
Update synology_dsm.sh
...
Split "[ && ]" into "[ ] && [ ]" to make ShellCheck happy
2023-07-04 15:55:44 +02:00
db3f131dfc
Re-add deprecated SYNO_TOTP_SECRET part for legacy compatibility
...
As requested in acmesh-official/acme.sh/pull/4646 by Neil Pang
2023-07-04 15:47:19 +02:00
d7f58c64f8
Merge branch 'acmesh-official:master' into patch-1
2023-07-04 14:57:19 +02:00
0548ad2fc6
Fix debug output of session ID
2023-05-28 22:33:15 +02:00
623d615cd7
Remove external OTP dependency from synology_dsm.sh
...
Also adapt to DSM 7's API improvements.
2023-05-28 21:42:53 +02:00
126df9647b
Modified keytest to perform a partial empty commit
2023-05-24 18:51:57 +00:00
2e2e7cd054
Added ability to force commit to firewall. Username is now also mandatory
2023-05-17 20:06:06 +00:00
0ebc9f7a44
Fixed typo
2023-05-15 01:46:21 +00:00
a8fba65cbd
Cleaned up verbiage. Added ability to store / update user variable. Added ability to use user/pass OR key
2023-05-15 01:43:54 +00:00
7623025b90
Fixes for POSIX sh shell
2023-04-24 18:45:50 +00:00
b937665b90
minor
2023-04-23 13:18:17 +08:00
a7bc2293c0
fix https://github.com/acmesh-official/acme.sh/issues/4612#issuecomment-1518929996
2023-04-23 13:16:12 +08:00
df753e2619
Added functionality to save and reuse API key
2023-04-12 22:00:53 +00:00
cbb7082afd
Fixed bug with wildcard certs and ecc keys
2023-03-31 00:33:44 +00:00
2690c05781
fix format
2023-01-28 15:28:06 +08:00
e3b688c9d8
fix format
2023-01-28 15:26:54 +08:00
41b6f18a5d
fix format
2023-01-28 15:25:50 +08:00
5a59c39036
fix format
2023-01-28 15:24:21 +08:00
a02dd18ad7
Merge pull request #4414 from beartom/master
...
Update truenas.sh to deploy certificate for TrueCharts
2023-01-28 15:20:10 +08:00
40002e8040
Merge pull request #4447 from PMExtra/feature/vault
...
improve vault and vault_cli deployhooks
2023-01-24 18:49:18 +08:00
ffed1a4afa
Merge pull request #4468 from DreamOfIce/master
...
Update deploy script for gcore
2023-01-20 09:11:23 +08:00
1bfd3642e8
Update gcore_cdn.sh
2023-01-19 10:19:05 +08:00
1ccfa96c2e
improve logging
2022-12-28 02:47:49 +08:00
ed63eb6833
migrate FABIO to VAULT_FABIO_MODE and persist it
2022-12-23 19:34:31 +08:00
b8d0d3c242
improve chain.pem exists evaluating
2022-12-23 19:17:37 +08:00
fe1bfe9ae1
improve vault and vault_api deployhooks
2022-12-23 18:59:01 +08:00
63869deeb2
Merge pull request #4091 from PMExtra/feature/ssh_scp
...
Refact ssh hook to use deploy config, support scp and support specifying port
2022-12-03 13:58:31 +08:00
bd2d0e6ad3
Format
...
Format
2022-11-28 20:59:10 +08:00
04a5d794ac
Update truenas.sh for certificate in chart release
...
Update certificate in chart release of TrueCharts if any chart release Apps is using the same certificate as TrueNAS web UI.
2022-11-27 21:55:01 +08:00
e275cb1efd
fix shellcheck warnings
2022-11-23 21:33:29 +08:00
60315e5b91
fix shellcheck warnings
2022-11-23 21:28:17 +08:00
6c8a623b88
Merge pull request #4329 from lippertmarkus/patch-1
...
[Deploy: synology_dsm] Make usage of DID with 2FA working for DSM 7
2022-10-05 14:18:37 +08:00
e02f07d356
add parked_domans
2022-10-01 18:11:46 -07:00
2c90d220b8
Updated comment to reflect the change to function
2022-10-01 17:47:13 -07:00
a7dd86de71
fix(deploy-synology_dsm): support DID with DSM 7
2022-09-29 12:22:45 +02:00
c541a2e5de
add addon_domans
2022-09-28 18:22:13 -05:00
b44ba0d21a
Add wildcard deployment to cpanel_uapi
2022-08-17 23:51:23 -08:00
afc0097b12
Merge pull request #4139 from wsellitti/proxmoxve
...
deploy api script to upload certs to proxmox using proxmox api
2022-07-11 22:23:02 +08:00
4e9f971c91
Merge pull request #4170 from SecT0uch/patch-1
...
Fix ecc certificates
2022-07-11 22:13:24 +08:00
41801a60ad
Also restart postfix
2022-07-09 14:30:18 +01:00
2cbf1259a8
Fix for ECC certificates
2022-07-07 17:20:23 +02:00
9b79743c5d
Update proxmoxve.sh
2022-06-23 14:12:53 +08:00
a386826808
Update proxmoxve.sh
2022-06-23 14:11:36 +08:00
668894fc4d
Update proxmoxve.sh
2022-06-23 14:08:24 +08:00
799f509ba9
typo
2022-06-22 23:19:12 -04:00
b3b4811b2c
added savedeployconf to preserve environment variables usedi in initial deployments
2022-06-19 22:01:56 -04:00
966e4246e5
Merge branch 'proxmoxve' of gitlab.lan.home.wesitcllc.com:software/upstream/acme.sh into proxmoxve
2022-06-19 01:49:51 -04:00
9377c4f3ad
Merge branch 'proxmoxve' of github.com:wsellitti/acme.sh into proxmoxve
2022-06-19 01:46:45 -04:00
b876128635
forced content-type to json
2022-06-19 01:46:10 -04:00
c0da801580
Revert "'+' are being converted to ' ' at some point"
...
This reverts commit 149310e1ec
2022-06-18 17:00:36 -04:00
149310e1ec
'+' are being converted to ' ' at some point
2022-06-18 16:58:15 -04:00
4e625c18dc
Revert "seems like the escaped new lines aren't remaining escaped new lines with the new version of curl"
...
This reverts commit a5d5113be3
2022-06-18 16:56:46 -04:00
a5d5113be3
seems like the escaped new lines aren't remaining escaped new lines with the new version of curl
2022-06-18 16:55:12 -04:00
7900c493af
debugging for the payload
2022-06-18 16:43:25 -04:00
76fe5d8831
those where flipped by mistake
2022-06-18 16:39:32 -04:00
37031721dd
typo
2022-06-18 15:52:18 -04:00
3cc283cbee
not generating files any more
2022-06-18 15:44:25 -04:00
35cf98fff2
sensititive things debugged at a higher level
2022-06-18 15:41:38 -04:00
ca41ea2d5c
added _getdeployconf to set all of the environment variables
2022-06-18 15:40:05 -04:00
daffc4e6a4
typo, using _H1 to provide header keys.
2022-06-18 12:21:14 -04:00
5f3cb9019b
fixed to use _post function instead of curl
2022-06-18 12:18:33 -04:00
7be7586971
Update proxmoxve.sh
2022-06-18 15:01:38 +08:00
6d64098288
shell check war warning against unnecessary use of cat
2022-06-14 23:46:09 -04:00
4351110082
properly quoted variable names
2022-06-14 22:38:06 -04:00
6652138d3e
fixed per shellcheck's preference for `-n` instead of `! -z`
2022-06-14 22:33:38 -04:00
c8d0d475e4
deploy api script to upload certs to proxmox using proxmox api
2022-06-11 13:49:31 -04:00
b169a5c707
change _dbase64 to single line
2022-06-08 22:44:10 +08:00
d2a9d731ed
Update ssh.sh
2022-05-24 22:25:44 +08:00
3ce7d410c8
improve doc comments
2022-05-14 22:59:02 +08:00
74f28021e7
fix format again
2022-05-14 22:49:40 +08:00
f90cbb636a
fix format
2022-05-14 22:41:59 +08:00
c8929ca0cb
support specifying port for each host
2022-05-14 22:29:48 +08:00
9fb5bb620d
refact ssh hook to use deploy config
2022-05-14 22:28:02 +08:00
ed58f32052
Merge branch 'dev' into feature/ssh_scp
2022-05-14 15:43:26 +08:00
08ae8cc3cb
Fix
2022-04-11 11:39:21 +02:00
201673ca8a
Store Mailcow deploy parameters
2022-04-11 00:29:55 +02:00
6fb8c0ec4c
Merge pull request #3989 from abiessmann/deploy_routeros_handle_remote_errors
...
deploy/routeros: handle errors
2022-03-20 13:30:58 +08:00
499ea07934
Merge pull request #3993 from imgrant/deploy-truenas-s3-feature
...
feat: Configure TrueNAS S3 certificate
2022-03-20 12:34:58 +08:00
afa06267a2
style: Neaten up some of the info & error messages, fix some typos
2022-03-19 20:39:48 +00:00
d4a6d9c076
fix: Adjust the sed extraction of certificate ID from JSON response
...
Prior to this, an error in the regex didn't match. Resolves #3992 (TrueNAS deploy hook fails to set certificate for FTP or WebDAV)
2022-03-19 20:38:47 +00:00
c3f6112443
feat: Configure certificate for TrueNAS S3 service (MinIO)
2022-03-19 20:36:11 +00:00
3411b736dd
deploy/routeros: add error handling for scp
...
In order to stop processing on failure to copy certificate
to remote side, fail on error of scp command.
Signed-off-by: Andreas Bießmann <andreas@biessmann.org>
2022-03-18 09:10:12 +01:00
c603b9c40b
deploy/routeros: add error handling for ssh
...
In order to detect errorneous scripts on remote side, catch return code
and handle it respectively.
Signed-off-by: Andreas Bießmann <andreas@biessmann.org>
Reviewed-by: Ross Shen @sjtuross
2022-03-18 09:07:59 +01:00
9d6d96adf3
deploy/routeros.sh: fix routeros script
...
Commit c46ceb06b4
2022-03-17 12:24:42 +01:00
b37bf06de8
Update ssh.sh
2022-03-01 17:57:59 +01:00
27bbf0ccaf
Merge branch 'acmesh-official:master' into master
2022-03-01 17:44:46 +01:00
c46ceb06b4
deploy/routeros.sh: change DEPLOY_SCRIPT_CMD
...
This set the owner of script to ssh user, have the comment line in script
as real comment and removes policy since this is set from current user,
at least for RouterOS 7.x.
Signed-off-by: Andreas Bießmann <andreas@biessmann.org>
2022-02-19 14:13:01 +01:00
92e4ecce3b
deploy/routeros.sh: remove all certificates
...
As the script is applying the fullchain which includes three certificates,
delete all of them before applying updated certificate.
Signed-off-by: Andreas Bießmann <andreas@biessmann.org>
2022-02-19 14:13:01 +01:00
8a2f673903
deploy/routeros.sh: make ssh/scp configurable
...
In order to modify ssh/scp commands make them configurable via
environment variables.
Signed-off-by: Andreas Bießmann <andreas@biessmann.org>
2022-02-19 14:12:59 +01:00
205e95a246
Add environment variables ROUTER_OS_PORT
2022-02-10 11:29:09 +08:00
3a99a77104
Update return statement
2022-02-07 21:55:12 -08:00
5ce8050e46
Update missing oathtool check
2022-02-07 11:58:14 -08:00
5ae3a020bd
Add err log for missing oathtool in Synology
...
Alerts the user that the oathtool is missing and the TOTP can't be
generated.
2022-02-07 11:53:24 -08:00
67c990e8cf
omv deploy hook: add usage comments
2022-01-20 17:46:47 +08:00
0292e20c86
omv deploy hook: support both local and remote deployment
2022-01-20 17:27:11 +08:00
a78a4e6716
omv deploy hook: shellcheck disable=SC2029
2022-01-19 21:42:17 +08:00
6bbf927f57
omv deploy hook: separate DEPLOY_OMV_WEBUI_ADMIN and DEPLOY_OMV_SSH_USER
2022-01-19 21:13:02 +08:00
dca9def42c
add remote deploy hook for openmediavault 5
...
based on #3757
2022-01-19 12:36:54 +08:00
edee7ea284
routeros deploy hook: store the env vars within the domainconf
...
related to #2344 and #2413
2022-01-16 20:46:09 +08:00
658d09ed84
Merge pull request #3396 from F-Plass/master
...
deploy scipt for TrueNAS Server using REST API
2022-01-16 08:17:49 +08:00
7e7291ace9
Support Vault KV v2 ( #3502 )
2022-01-09 11:01:38 +08:00
c959d64099
Merge pull request #3807 from dacrystal/topic/synology_dsm-otp_code
...
Add SYNO_TOTP_SECRET for user with two-factor authentication enabled
2022-01-08 20:03:13 +08:00
6aa1ec0802
deploy/fritzbox: allow hook to be used with multiple fritzboxes
...
Previously the deploy hook config was stored in the account config.
This seems odd and adds unnecessary limitations to the hook.
Now we're using the correct _*deployconf() functions to read and
write the deploy hook config.
2022-01-06 16:20:43 +01:00
71a32477e4
Merge branch 'acmesh-official:master' into master
2021-12-20 09:28:19 +01:00
b203f2abaa
Merge branch 'acmesh-official:master' into master
2021-12-03 17:18:44 +01:00
4635dacf7f
Add SYNO_TOTP_SECRET for user with two-factor authentication
2021-11-13 13:01:38 +03:00
3bcb91f6ae
Update truenas.sh
...
solved the problem of UI-Restart after 12.0-U3
2021-11-11 23:03:00 +01:00
a31ed4a723
Notify user about a possible problem when using synology_dsm.sh with 2fa enabled user account
2021-11-01 01:40:14 -03:00
fba6de76b1
Merge pull request #3687 from gstrauss/use-getdeployconf
...
use _getdeployconf instead of sourcing DOMAIN_CONF
2021-10-01 12:41:12 +08:00
8419b42e83
use ${ACME_OPENSSL_BIN:-openssl} instead of openssl
...
(requested by @Neilpang in #3687 )
2021-09-30 19:00:39 -04:00
2447fccf1e
name="snis" => name="snis[]"
...
kong 2.5.x，snis参数是一个数组
2021-09-04 16:59:50 +08:00
c43c711f72
use _getdeployconf instead of sourcing DOMAIN_CONF
...
(requested by @Neilpang in #3394 )
github: closes #3394
2021-09-01 16:37:10 -04:00
f354e6de69
lighttpd deploy hook
...
* verbatim copy from haproxy.sh, s/haproxy/lighttpd
* enable issuer
2021-09-01 16:33:24 -04:00
08d60fcbf2
Update ssh.sh
...
shfmt formatting
2021-08-30 11:32:07 +02:00
4cda54774a
Update ssh.sh
...
SC2086 and SC2215
2021-08-30 11:17:03 +02:00
613475ac26
Update ssh.sh
2021-08-30 11:08:06 +02:00
20d23fcb92
Update ssh.sh
...
Added scp mode for copy the certs
2021-08-25 16:55:36 +02:00
f41f93af3a
Merge pull request #3491 from bgarret/consul-deploy-hook
...
Consul deploy hooks
2021-06-24 20:25:01 +08:00
dcb51683c5
shellcheck cleanup
...
shellcheck sees '\\' as trying to escape the trailing quote (see
koalaman/shellcheck#1548 ).
2021-05-26 15:25:58 -06:00
74a4a788b1
Make certificate descriptions sed safe
...
This escapes special characters used in POSIX sed to prevent mismatches.
e.g. `SYNO_Certficiate=*.example.com` would not match a description of
"*.example.com" and would look to match any number of double quotes (the
last character in the sed regex prior to certificate description),
followed by any single character, followed by "example", followed by any
character, followed by "com".
After this change, it will properly match `*.example.com` and not
`""zexamplefcom`.
Additionally we now store the certificate description as base64 encoded
to prevent issues with single quotes.
Tested on DSM 7.0-41222 (VDSM) and DSM 6.2.4-25556 (DS1515+).
2021-05-26 15:25:58 -06:00
5ab9ca1c0d
Better fix for Synology DSM setting wrong default
...
As noted by @buxm, previous fix didn't work for all versions of DSM 6.
The better fix appears to be simply not outputting the "as_default"
parameter unless we are doing something with the default certificate.
2021-05-19 13:21:34 -06:00
07afc4953a
Fix the shfmt check
2021-05-07 12:12:30 +02:00
8c14150536
Merge pull request #3350 from temoffey/deploy-gcore_cdn
...
Deploy gcore_cdn fix
2021-05-05 23:48:37 +08:00
c127903127
Add Consul deploy hook
2021-05-05 10:01:09 +02:00
William Lallemand