PM Extra
9fb5bb620d
refact ssh hook to use deploy config
2022-05-14 22:28:02 +08:00
PM Extra
ed58f32052
Merge branch 'dev' into feature/ssh_scp
2022-05-14 15:43:26 +08:00
quthla
08ae8cc3cb
Fix
2022-04-11 11:39:21 +02:00
quthla
201673ca8a
Store Mailcow deploy parameters
2022-04-11 00:29:55 +02:00
neil
6fb8c0ec4c
Merge pull request #3989 from abiessmann/deploy_routeros_handle_remote_errors
...
deploy/routeros: handle errors
2022-03-20 13:30:58 +08:00
neil
499ea07934
Merge pull request #3993 from imgrant/deploy-truenas-s3-feature
...
feat: Configure TrueNAS S3 certificate
2022-03-20 12:34:58 +08:00
Ian Grant
afa06267a2
style: Neaten up some of the info & error messages, fix some typos
2022-03-19 20:39:48 +00:00
Ian Grant
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
Ian Grant
c3f6112443
feat: Configure certificate for TrueNAS S3 service (MinIO)
2022-03-19 20:36:11 +00:00
Andreas Bießmann
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
Andreas Bießmann
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
Andreas Bießmann
9d6d96adf3
deploy/routeros.sh: fix routeros script
...
Commit c46ceb06b4
introduced an error in
routeros script.
Fix it!
Signed-off-by: Andreas Bießmann <andreas@biessmann.org>
2022-03-17 12:24:42 +01:00
fradev
b37bf06de8
Update ssh.sh
2022-03-01 17:57:59 +01:00
fradev
27bbf0ccaf
Merge branch 'acmesh-official:master' into master
2022-03-01 17:44:46 +01:00
Andreas Bießmann
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
Andreas Bießmann
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
Andreas Bießmann
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
Mac_Zhou
205e95a246
Add environment variables ROUTER_OS_PORT
2022-02-10 11:29:09 +08:00
John Elliott
3a99a77104
Update return statement
2022-02-07 21:55:12 -08:00
John Elliott
5ce8050e46
Update missing oathtool check
2022-02-07 11:58:14 -08:00
John Elliott
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
Ross Shen
67c990e8cf
omv deploy hook: add usage comments
2022-01-20 17:46:47 +08:00
Ross Shen
0292e20c86
omv deploy hook: support both local and remote deployment
2022-01-20 17:27:11 +08:00
Ross Shen
a78a4e6716
omv deploy hook: shellcheck disable=SC2029
2022-01-19 21:42:17 +08:00
Ross Shen
6bbf927f57
omv deploy hook: separate DEPLOY_OMV_WEBUI_ADMIN and DEPLOY_OMV_SSH_USER
2022-01-19 21:13:02 +08:00
Ross Shen
dca9def42c
add remote deploy hook for openmediavault 5
...
based on #3757
2022-01-19 12:36:54 +08:00
Ross Shen
edee7ea284
routeros deploy hook: store the env vars within the domainconf
...
related to #2344 and #2413
2022-01-16 20:46:09 +08:00
neil
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
Sergey Pashinin
7e7291ace9
Support Vault KV v2 ( #3502 )
2022-01-09 11:01:38 +08:00
neil
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
Frank Wall
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
fradev
71a32477e4
Merge branch 'acmesh-official:master' into master
2021-12-20 09:28:19 +01:00
F-Plass
b203f2abaa
Merge branch 'acmesh-official:master' into master
2021-12-03 17:18:44 +01:00
Nasser Alansari
4635dacf7f
Add SYNO_TOTP_SECRET for user with two-factor authentication
2021-11-13 13:01:38 +03:00
F-Plass
3bcb91f6ae
Update truenas.sh
...
solved the problem of UI-Restart after 12.0-U3
2021-11-11 23:03:00 +01:00
Miguel Angelo
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
neil
fba6de76b1
Merge pull request #3687 from gstrauss/use-getdeployconf
...
use _getdeployconf instead of sourcing DOMAIN_CONF
2021-10-01 12:41:12 +08:00
Glenn Strauss
8419b42e83
use ${ACME_OPENSSL_BIN:-openssl} instead of openssl
...
(requested by @Neilpang in #3687 )
2021-09-30 19:00:39 -04:00
Nookery
2447fccf1e
name="snis" => name="snis[]"
...
kong 2.5.x,snis参数是一个数组
2021-09-04 16:59:50 +08:00
Glenn Strauss
c43c711f72
use _getdeployconf instead of sourcing DOMAIN_CONF
...
(requested by @Neilpang in #3394 )
github: closes #3394
2021-09-01 16:37:10 -04:00
Michael Weber
f354e6de69
lighttpd deploy hook
...
* verbatim copy from haproxy.sh, s/haproxy/lighttpd
* enable issuer
2021-09-01 16:33:24 -04:00
fradev
08d60fcbf2
Update ssh.sh
...
shfmt formatting
2021-08-30 11:32:07 +02:00
fradev
4cda54774a
Update ssh.sh
...
SC2086 and SC2215
2021-08-30 11:17:03 +02:00
fradev
613475ac26
Update ssh.sh
2021-08-30 11:08:06 +02:00
fradev
20d23fcb92
Update ssh.sh
...
Added scp mode for copy the certs
2021-08-25 16:55:36 +02:00
neil
f41f93af3a
Merge pull request #3491 from bgarret/consul-deploy-hook
...
Consul deploy hooks
2021-06-24 20:25:01 +08:00
Brian Hartvigsen
dcb51683c5
shellcheck cleanup
...
shellcheck sees '\\' as trying to escape the trailing quote (see
koalaman/shellcheck#1548 ).
2021-05-26 15:25:58 -06:00
Brian Hartvigsen
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
Brian Hartvigsen
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
Benoit Garret
07afc4953a
Fix the shfmt check
2021-05-07 12:12:30 +02:00