From 2095f4e33a154f9de37893edc101d7652e576835 Mon Sep 17 00:00:00 2001 From: Paul Cammish Date: Fri, 21 Jun 2019 09:22:10 +0100 Subject: [PATCH 1/2] Moved sympl-ssl to sbin to avoid permissions/hook issues --- core/debian/changelog | 6 ++++++ core/{bin => sbin}/sympl-ssl | 0 core/update-motd.d/00-sympl-banner | 4 ++-- 3 files changed, 8 insertions(+), 2 deletions(-) rename core/{bin => sbin}/sympl-ssl (100%) diff --git a/core/debian/changelog b/core/debian/changelog index 10baf392..d7bd29e5 100644 --- a/core/debian/changelog +++ b/core/debian/changelog @@ -1,3 +1,9 @@ +sympl-core (9.0.190621.0) stable; urgency=medium + + * Moved sympl-ssl to sbin to avoid permissions/hook issues. + + -- Paul Cammish Fri, 21 Jun 2019 09:19:00 +0100 + sympl-core (9.0.190620.1) stable; urgency=medium * Updated recommended packages diff --git a/core/bin/sympl-ssl b/core/sbin/sympl-ssl similarity index 100% rename from core/bin/sympl-ssl rename to core/sbin/sympl-ssl diff --git a/core/update-motd.d/00-sympl-banner b/core/update-motd.d/00-sympl-banner index e3fea0e1..ee840f6a 100755 --- a/core/update-motd.d/00-sympl-banner +++ b/core/update-motd.d/00-sympl-banner @@ -1,6 +1,6 @@ #!/bin/sh -echo `tput bold` +echo -e "\033[1m" cat < Date: Fri, 21 Jun 2019 09:40:59 +0100 Subject: [PATCH 2/2] Tweaked crons --- core/debian/cron.d | 8 -------- core/debian/links | 21 +++++++++++---------- core/debian/postinst | 3 +++ 3 files changed, 14 insertions(+), 18 deletions(-) diff --git a/core/debian/cron.d b/core/debian/cron.d index 29c4244c..d034e57e 100644 --- a/core/debian/cron.d +++ b/core/debian/cron.d @@ -1,9 +1,3 @@ -# -# Check the security of various sensative directories, and fix where needed -# - -@hourly root [ -x /usr/sbin/sympl-filesystem-security ] && /usr/sbin/sympl-filesystem-security - # # Test the strength of user passwords. @@ -17,5 +11,3 @@ # weekly check @weekly root [ -x /usr/sbin/sympl-password-test ] && /usr/sbin/sympl-password-test --weekly -# daily check of SSL certificates -@daily root [ -x /usr/bin/sympl-ssl ] && /usr/bin/sympl-ssl diff --git a/core/debian/links b/core/debian/links index f8f3e356..6ae05da2 100644 --- a/core/debian/links +++ b/core/debian/links @@ -1,10 +1,11 @@ -usr/bin/sympl-encrypt-password usr/bin/symbiosis-encrypt-password -usr/bin/sympl-ip usr/bin/symbiosis-ip -usr/bin/sympl-ssl usr/bin/symbiosis-ssl -usr/bin/sympl-test usr/bin/symbiosis-test -usr/sbin/sympl-configure-ips usr/sbin/symbiosis-configure-ips -usr/sbin/sympl-generate-dhparams usr/sbin/symbiosis-generate-dhparams -usr/sbin/sympl-password-test usr/sbin/symbiosis-password-test -usr/sbin/sympl-configure-ips etc/network/if-up.d/sympl-configure-ips -usr/sbin/sympl-configure-ips etc/cron.hourly/sympl-configure-ips -usr/sbin/sympl-ssl etc/cron.hourly/00-sympl-ssl +usr/bin/sympl-encrypt-password usr/bin/symbiosis-encrypt-password +usr/bin/sympl-ip usr/bin/symbiosis-ip +usr/sbin/sympl-ssl usr/sbin/symbiosis-ssl +usr/bin/sympl-test usr/bin/symbiosis-test +usr/sbin/sympl-configure-ips usr/sbin/symbiosis-configure-ips +usr/sbin/sympl-generate-dhparams usr/sbin/symbiosis-generate-dhparams +usr/sbin/sympl-password-test usr/sbin/symbiosis-password-test +usr/sbin/sympl-configure-ips etc/network/if-up.d/sympl-configure-ips +usr/sbin/sympl-configure-ips etc/cron.hourly/sympl-configure-ips +usr/sbin/sympl-ssl etc/cron.daily/sympl-ssl +usr/sbin/sympl-filesystem-security etc/cron.hourly/sympl-filesystem-security diff --git a/core/debian/postinst b/core/debian/postinst index e9b55445..3d989405 100755 --- a/core/debian/postinst +++ b/core/debian/postinst @@ -232,6 +232,9 @@ account_guest_in_cpu_meter=1" > /root/.config/htop/htoprc chown root:root /root/.config/htop/htoprc fi +# Remove rogue symlink +if [ -L /etc/cron.hourly/00-sympl-ssl ]; then rm /etc/cron.hourly/00-sympl-ssl; fi + #DEBHELPER# -- GitLab