Commit Graph

265 Commits

Author SHA1 Message Date
neilpang
a18c3ff07d use sh -c 2019-06-02 15:21:08 +08:00
neilpang
64928b28bc trim quotation marks 2019-06-02 11:11:34 +08:00
neilpang
0bbaa51945 fix format 2019-06-02 10:05:24 +08:00
neilpang
561803c0a7 add deploy hook to docker containers 2019-06-01 22:30:25 +08:00
Charlie Garrison
03a407d4df Added additional shellcheck ignores for client-side evaluation warning
Should pass CI tests now
2019-05-29 14:05:20 +10:00
Charlie Garrison
0cddc8a154 change to routeros native script rather than bash multiline commands 2019-05-26 01:32:13 +10:00
neilpang
1a126b700f fix https://github.com/Neilpang/acme.sh/issues/2252 2019-05-08 22:13:33 +08:00
neil
b28835a604
Update haproxy deploy hook (#1591)
* implement basic haproxy deploy

HAProxy requires the certificate chain and key to be concatenated and placed somewhere (can be anywhere). This script expects a single environment variable with the path where the concatenated PEM file should be written

* add docs for HAProxy deployment

* Add conditional check to ensure path is provided

* remove whitespace

* remove more whitespace (trying to get TravisCI working)

* add reload

* update for POSIX compliance

* add documentation for reload command

* Update haproxy deploy hook

Add functionality to add OCSP stapling info (.ocsp file), issuer (.issuer file) and multi-cert bundles (suffix on pem file based on key type).

This also corrects the order of key, certificate and intermediate in the PEM file, which although HAProxy does not seem to care, was incorrect in the prior version.

* Document updated haproxy deploy hook

* Fix variable name

* whitespace fixes

* Support HAPROXY_DEPLOY_PEM_PATH

Adds compatibility to original haproxy deploy hook while still allowing custom PEM file name (via HAPROXY_DEPLOY_PEM_NAME)

* update for new haproxy deploy vars

* Fix return from reload

* Fix Le_Keylength case

* Update cert suffix for bundles .ocsp generation

* Whitepspace

* Change default for reload

* Readme update

* Actually set reload default

* Fix README.md confict
2019-05-01 15:13:42 +08:00
Тимур Яхин
6340704173 fixed line breaks for support api gcore_cdn (#2237) 2019-05-01 15:11:39 +08:00
andrewheberle
37ef0a0cb6
Fix README.md confict 2019-04-30 15:32:36 +08:00
neil
d1f39e6217
Merge pull request #706 from palhaland/dev
Shell script for deploying changes to a routeros server.
2019-04-10 20:49:05 +08:00
neil
297859c5bc
Merge pull request #2191 from temoffey/gcore_cdn_deploy
fix gcore_cdn_deploy
2019-03-23 21:46:40 +08:00
temoffey
bea52aa743 remove use grep -E 2019-03-23 16:29:33 +03:00
neil
a4cc9ef2cc
Merge pull request #2178 from temoffey/gcore_cdn_deploy
Gcore cdn deploy
2019-03-23 11:06:16 +08:00
temoffey
df9174577a remove check jq 2019-03-22 23:00:47 +03:00
temoffey
bd1bb7a71b fix syntax 2019-03-22 20:08:35 +03:00
temoffey
4b6e7e6c37 remove use while, [[ ]], array 2019-03-22 20:02:59 +03:00
temoffey
8896642e25 fix syntax 2019-03-22 20:01:39 +03:00
temoffey
0ecb5a3fec fix syntax 2019-03-22 04:31:58 +03:00
temoffey
d289b0b450 fix syntax 2019-03-22 04:21:41 +03:00
temoffey
b8489464b3 remove use awk, jq, curl 2019-03-22 03:41:26 +03:00
Pål Håland
ebaa3f39e4 Merge remote-tracking branch 'origin/dev' into dev 2019-03-21 15:54:02 +01:00
Pål Håland
e19753dcde Moved documentation from deploy/README.md to deploy/routeros.sh 2019-03-21 15:53:11 +01:00
temoffey
16b0704acc remove readme 2019-03-20 18:10:53 +03:00
neilpang
61bcd67a5d move to wiki 2019-03-20 23:03:49 +08:00
temoffey
89989adcad fix syntax 2019-03-20 14:05:18 +03:00
temoffey
95cdb4b2bc fix syntax 2019-03-20 14:02:11 +03:00
temoffey
228c835466 gcore_cdn_deploy 2019-03-20 03:03:10 +03:00
Valentin Brandl
d604166194
Fix formatting 2019-03-19 19:15:31 +01:00
Valentin Brandl
d643a2ff13
Check if mailcow path is set and fix directory check 2019-03-19 19:09:25 +01:00
Valentin Brandl
b581a171f0
Add documentation for mailcow deploy hook 2019-03-19 18:43:07 +01:00
Valentin Brandl
307336cfc4
Add deploy hook for mailcow
This hook will copy the key and certificate chain to the specified
mailcow installation (as described in
https://mailcow.github.io/mailcow-dockerized-docs/firststeps-ssl/#use-own-certificates)
and restarts the containers, that are using the certificates.

The hook has 2 parameters:

* `DEPLOY_MAILCOW_PATH`: The path to the mailcow installation (required)
* `DEPLOY_MAILCOW_RELOAD`: The reload command, defaults to `docker-compose restart postfix-mailcow dovecot-mailcow nginx-mailcow`
2019-03-19 18:42:47 +01:00
Pål Håland
86fbb5952e Use env sh 2019-03-02 16:39:41 +01:00
neil
2a52603b7e
Merge pull request #2128 from the729/fix-qiniu-base64
fix deploy/qiniu.sh base64
2019-03-01 22:44:23 +08:00
tianji
22e7b4c911 fix doc of qiniu deploy script
A leading dot should be included when updating wildcard domains.
2019-02-28 23:51:43 +08:00
tianji
af5f7a7779 fix deploy/qiniu.sh base64
According to the doc (https://developer.qiniu.com/kodo/manual/1231/appendix#1), we should use URL-safe base64 instead of plain base64 for token calculation.
2019-02-28 23:43:58 +08:00
Pål Håland
1dab2ac7d3 Updated with latest changes from Neilpang/dev 2019-02-26 17:41:24 +01:00
Marcin Konicki
16a0f40ac2 Support for MyDevil.net (#2076)
support mydevil
2019-02-20 09:40:36 +08:00
shonenada
a4a53e1355
Move docs into README.md from README_zh.md 2019-01-21 17:33:09 +08:00
shonenada
c445e70cff
fix indent 2019-01-21 14:33:15 +08:00
shonenada
e8eec2cb41
add chinese readme 2019-01-21 00:11:06 +08:00
shonenada
dd6fa4af00
Save QINIU_CDN_DOMAIN only when defined 2019-01-20 23:58:10 +08:00
shonenada
afdb9a63ff
chore: replece Le_Deploy_Qiniu_* with QINIU_* 2019-01-19 23:58:55 +08:00
shonenada
4c1fa9c242
save CDN Domain with _savedomainconf 2019-01-14 22:55:05 +08:00
shonenada
3c6b707353
add QINIU_CDN_DOMAIN for wildcard certificate 2019-01-13 12:25:03 +08:00
shonenada
96efc8c7f0
lint codes 2019-01-12 23:11:19 +08:00
shonenada
0cd6afde6f
Add guidance to deploying cert to qiniu.com 2019-01-12 21:15:16 +08:00
shonenada
82b11da4ca
replace awk with sed and tr 2019-01-12 21:07:22 +08:00
shonenada
4ec39ab707
replace with functions defined in acme.sh 2019-01-12 20:16:28 +08:00
shonenada
d2a60f3ca4
lint code 2019-01-12 15:54:42 +08:00
shonenada
3bc6628227
Update Qiniu's domain settings after uploading certificate 2019-01-12 15:25:36 +08:00
shonenada
e19809d5b5
Add deployment for qiniu cdn
Upload certificate and privkey to Qiniu's CDN service with https://developer.qiniu.com/fusion/api/4248/certificate
2019-01-11 18:47:01 +08:00
Sergey Pashinin
9f067d7f56
Deploy to Hashicorp Vault docs 2018-12-10 18:17:18 +03:00
Sergey Pashinin
c84466b131
Write certs in Vault for Fabio load balancer 2018-12-10 16:55:21 +03:00
andrewheberle
454c90820d
Actually set reload default 2018-09-28 08:57:13 +08:00
andrewheberle
0a4e61c1dd
Readme update 2018-09-28 08:46:39 +08:00
andrewheberle
31d9ba7e02
Change default for reload 2018-09-28 08:45:18 +08:00
Christian Brandel
80b40c02b4 use perl instead of iconv, if iconv is not available 2018-09-10 01:24:20 +02:00
Yann Bizeul
8d6443b25d Fix Syntax 2018-08-21 16:41:45 +02:00
Yann Bizeul
e3c7fc8077 Fix Syntax 2018-08-21 16:35:39 +02:00
Yann Bizeul
bbf2a15f27 Fix Syntax 2018-08-21 16:30:33 +02:00
Yann Bizeul
5a326b82bd Fix Syntax 2018-08-21 16:24:57 +02:00
Yann Bizeul
f1b0dd7836 Fix Syntax 2018-08-21 16:22:08 +02:00
Yann Bizeul
c205777542 Better integration with acme.sh utils 2018-08-21 16:18:00 +02:00
Yann Bizeul
b401dbbf65 Fix Syntax 2018-08-15 19:17:24 +02:00
Yann Bizeul
75dd0a770f Fix Syntax 2018-08-15 19:10:31 +02:00
Yann Bizeul
6d8292cdd8 Syntax fix 2018-08-15 19:00:08 +02:00
Yann Bizeul
0575eb671a Fix double quote around URL 2018-08-15 18:44:24 +02:00
Yann Bizeul
d06eea53ef Add deploy plugin for Gitlab pages 2018-08-15 18:36:34 +02:00
Yann Bizeul
9e96a93172 Updated README with Gitlab help 2018-08-15 18:36:24 +02:00
little-fat
63134fafec Fix key leakage in SSH deploy log 2018-08-02 20:57:27 +08:00
neil
f60dde4138
Merge pull request #1698 from Neilpang/dev
Dev
2018-06-29 20:12:57 +08:00
neilpang
9c545059ae fix warning 2018-06-28 22:21:22 +08:00
neilpang
05dea7b22a fix warning 2018-06-28 20:34:29 +08:00
Santeri Kannisto
d987d61ea9
Issue #1328 bug fix v3
Eliminated php dependency with a private function for urlencode using sed. Php had failed on godaddy due to multiple php instances and naturally cron using the one without the necessary -r option. Compared to previous PR the sed code is now POSIX and should work on all environments.
2018-06-28 09:38:14 +02:00
andrewheberle
8d348954a7
Whitepspace 2018-05-14 13:22:46 +08:00
andrewheberle
7d19d784df
Update cert suffix for bundles .ocsp generation 2018-05-14 13:16:56 +08:00
andrewheberle
733b4e0a34
Fix Le_Keylength case 2018-05-14 11:26:03 +08:00
andrewheberle
08d29a8342
Fix return from reload 2018-05-14 10:58:46 +08:00
andrewheberle
675e2d25d6
update for new haproxy deploy vars 2018-05-10 15:28:54 +08:00
andrewheberle
ba20af48d3
Support HAPROXY_DEPLOY_PEM_PATH
Adds compatibility to original haproxy deploy hook while still allowing custom PEM file name (via HAPROXY_DEPLOY_PEM_NAME)
2018-05-10 15:25:28 +08:00
andrewheberle
707e053949
whitespace fixes 2018-05-10 12:18:03 +08:00
andrewheberle
c47e67e52c
Fix variable name 2018-05-10 12:06:25 +08:00
andrewheberle
3a95bfb699
Document updated haproxy deploy hook 2018-05-10 12:02:58 +08:00
andrewheberle
6567bb4c12
Update haproxy deploy hook
Add functionality to add OCSP stapling info (.ocsp file), issuer (.issuer file) and multi-cert bundles (suffix on pem file based on key type).

This also corrects the order of key, certificate and intermediate in the PEM file, which although HAProxy does not seem to care, was incorrect in the prior version.
2018-05-10 11:51:59 +08:00
Daniel Watrous
c9818ea2c4
add documentation for reload command 2018-05-04 13:03:27 -05:00
Daniel Watrous
afe5cb588d
update for POSIX compliance 2018-05-04 10:25:54 -05:00
Daniel Watrous
e9e999542d
add reload 2018-05-04 10:14:31 -05:00
Daniel Watrous
5f593994c7
remove more whitespace (trying to get TravisCI working) 2018-05-03 12:25:11 -05:00
Daniel Watrous
ec73aeba16
remove whitespace 2018-05-03 12:17:26 -05:00
Daniel Watrous
7573e560b6
Add conditional check to ensure path is provided 2018-05-03 10:06:05 -05:00
Daniel Watrous
c8bc155cfe
Merge pull request #1 from dwatrous/patch-2
add docs for HAProxy deployment
2018-05-03 01:38:33 -05:00
Daniel Watrous
1eae73105a
add docs for HAProxy deployment 2018-05-03 01:33:06 -05:00
Daniel Watrous
360dc140ea
implement basic haproxy deploy
HAProxy requires the certificate chain and key to be concatenated and placed somewhere (can be anywhere). This script expects a single environment variable with the path where the concatenated PEM file should be written
2018-05-03 01:28:56 -05:00
Bob Belnap
87a8dda955 add chain cert 2018-03-28 12:40:31 -04:00
Pål Håland
8d38cf4d1f Use allchain instead of ca an cert, add documentation after review 2018-03-26 22:00:01 +02:00
Pål Håland
d698c1093a remove spaces around assignment 2018-03-26 08:24:04 +02:00
Pål Håland
7b327d47c0 Fix documentation 2018-03-26 08:21:31 +02:00
Pål Håland
e629985cf4 Use _cdomain if ROUTER_OS_HOST is missing 2018-03-26 07:41:56 +02:00
Pål Håland
aa875f1147 Merge branch 'master' into dev 2018-03-25 22:50:58 +02:00