Skip to content

Commit eb89957

Browse files
committed
Depend on turnkey-ssl and update 15regen-sslcert firstboot script
1 parent 4a20778 commit eb89957

File tree

2 files changed

+5
-7
lines changed

2 files changed

+5
-7
lines changed

debian/control

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Depends:
1515
kbd,
1616
${misc:Depends},
1717
${python3:Depends},
18-
rsyslog,
18+
turnkey-ssl,
1919
python3-dialog (>= 3.4.0~),
2020
dialog (>= 1.3~),
2121
Recommends:

firstboot.d/15regen-sslcert

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash -e
22
# Regenerate self-signed TLS/SSL cert & key
33

4-
[ -n "$_TURNKEY_INIT" ] && exit 0
4+
[[ -n "$_TURNKEY_INIT" ]] && exit 0
55

66
[[ -e $INITHOOKS_CONF ]] && . $INITHOOKS_CONF
77

@@ -11,23 +11,21 @@ fatal() { echo "FATAL: [$_hook] $@" 1>&2 ; exit 1 ; }
1111
info() { echo "INFO: [$_hook] $@" ; }
1212

1313
# Check for 'turnkey-make-ssl-cert' - should be provided by
14-
# common/overlays/turnkey.d/sslcert.
14+
# turnkey-ssl package.
1515
turnkey_make_ssl_cert=$(which turnkey-make-ssl-cert) \
1616
|| fatal "turnkey-make-ssl-cert executable not found."
1717

1818
# As of v17.0 a predefined 4096 bits default dhparams file is provided. Please
1919
# see https://github.com/turnkeylinux/tracker/issues/1653 for more info.
2020
info "Generating SSL/TLS cert & key."
21-
$turnkey_make_ssl_cert --default --force-overwrite
21+
$turnkey_make_ssl_cert --default --force
2222

2323
# Restart relevant services
2424
SERVICES="\
2525
nginx
2626
apache2
2727
lighttpd
28-
tomcat9
29-
stunnel4@webmin
30-
stunnel4@shellinabox"
28+
tomcat9"
3129

3230
info "Restarting relevant services."
3331
for service in $SERVICES; do

0 commit comments

Comments
 (0)