diff options
author | nachoparker <nacho@ownyourbits.com> | 2017-09-04 10:23:48 +0300 |
---|---|---|
committer | nachoparker <nacho@ownyourbits.com> | 2017-09-04 19:29:13 +0300 |
commit | 4c70d1514861484ff283c8679654fb1d5a22db51 (patch) | |
tree | 8ae9c4242783aca18d37c6d098f54c57af3b6a81 | |
parent | 00e8c777fc8e3d7dd7193ffcdc16f49c7724e28b (diff) |
cleanup: dont disable ssh in extras, only in nextcloudpi.shv0.26.9
-rw-r--r-- | etc/nextcloudpi-config.d/NFS.sh | 2 | ||||
-rw-r--r-- | etc/nextcloudpi-config.d/dnsmasq.sh | 2 | ||||
-rw-r--r-- | etc/nextcloudpi-config.d/fail2ban.sh | 2 | ||||
-rw-r--r-- | etc/nextcloudpi-config.d/letsencrypt.sh | 2 | ||||
-rw-r--r-- | etc/nextcloudpi-config.d/modsecurity.sh | 2 | ||||
-rw-r--r-- | etc/nextcloudpi-config.d/nc-automount.sh | 2 | ||||
-rw-r--r-- | etc/nextcloudpi-config.d/nc-forward-ports.sh | 2 | ||||
-rw-r--r-- | etc/nextcloudpi-config.d/nc-nextcloud.sh | 6 | ||||
-rw-r--r-- | etc/nextcloudpi-config.d/nc-wifi.sh | 2 | ||||
-rw-r--r-- | etc/nextcloudpi-config.d/no-ip.sh | 6 | ||||
-rw-r--r-- | etc/nextcloudpi-config.d/samba.sh | 2 | ||||
-rw-r--r-- | etc/nextcloudpi-config.d/unattended-upgrades.sh | 2 |
12 files changed, 2 insertions, 30 deletions
diff --git a/etc/nextcloudpi-config.d/NFS.sh b/etc/nextcloudpi-config.d/NFS.sh index 97d4eb8c..415a13cf 100644 --- a/etc/nextcloudpi-config.d/NFS.sh +++ b/etc/nextcloudpi-config.d/NFS.sh @@ -105,8 +105,6 @@ cleanup() apt-get autoremove -y apt-get clean rm /var/lib/apt/lists/* -r - rm -f /home/pi/.bash_history - systemctl disable ssh } # License diff --git a/etc/nextcloudpi-config.d/dnsmasq.sh b/etc/nextcloudpi-config.d/dnsmasq.sh index 5688b5c0..3ae99301 100644 --- a/etc/nextcloudpi-config.d/dnsmasq.sh +++ b/etc/nextcloudpi-config.d/dnsmasq.sh @@ -69,8 +69,6 @@ cleanup() apt-get autoremove -y apt-get clean rm /var/lib/apt/lists/* -r - rm -f /home/pi/.bash_history - systemctl disable ssh } # License diff --git a/etc/nextcloudpi-config.d/fail2ban.sh b/etc/nextcloudpi-config.d/fail2ban.sh index fb872a3d..fa4c1fe9 100644 --- a/etc/nextcloudpi-config.d/fail2ban.sh +++ b/etc/nextcloudpi-config.d/fail2ban.sh @@ -125,8 +125,6 @@ cleanup() apt-get autoremove -y apt-get clean rm /var/lib/apt/lists/* -r - rm -f /home/pi/.bash_history - systemctl disable ssh } # License diff --git a/etc/nextcloudpi-config.d/letsencrypt.sh b/etc/nextcloudpi-config.d/letsencrypt.sh index ed64592f..3c853ee1 100644 --- a/etc/nextcloudpi-config.d/letsencrypt.sh +++ b/etc/nextcloudpi-config.d/letsencrypt.sh @@ -74,8 +74,6 @@ cleanup() apt-get autoremove -y apt-get clean rm /var/lib/apt/lists/* -r - rm -f /home/pi/.bash_history - systemctl disable ssh } # License diff --git a/etc/nextcloudpi-config.d/modsecurity.sh b/etc/nextcloudpi-config.d/modsecurity.sh index c5d4bb3b..aa1e9c69 100644 --- a/etc/nextcloudpi-config.d/modsecurity.sh +++ b/etc/nextcloudpi-config.d/modsecurity.sh @@ -124,8 +124,6 @@ cleanup() apt-get autoremove -y apt-get clean rm /var/lib/apt/lists/* -r - rm -f /home/pi/.bash_history - systemctl disable ssh } # License diff --git a/etc/nextcloudpi-config.d/nc-automount.sh b/etc/nextcloudpi-config.d/nc-automount.sh index 03395f5a..b3a15e92 100644 --- a/etc/nextcloudpi-config.d/nc-automount.sh +++ b/etc/nextcloudpi-config.d/nc-automount.sh @@ -131,8 +131,6 @@ cleanup() apt-get autoremove -y apt-get clean rm /var/lib/apt/lists/* -r - rm -f /home/pi/.bash_history - systemctl disable ssh } diff --git a/etc/nextcloudpi-config.d/nc-forward-ports.sh b/etc/nextcloudpi-config.d/nc-forward-ports.sh index 5f1fdfc6..85c6a171 100644 --- a/etc/nextcloudpi-config.d/nc-forward-ports.sh +++ b/etc/nextcloudpi-config.d/nc-forward-ports.sh @@ -52,8 +52,6 @@ cleanup() apt-get autoremove -y apt-get clean rm /var/lib/apt/lists/* -r - rm -f /home/pi/.bash_history - systemctl disable ssh } # License diff --git a/etc/nextcloudpi-config.d/nc-nextcloud.sh b/etc/nextcloudpi-config.d/nc-nextcloud.sh index 9d0072a7..a31f57da 100644 --- a/etc/nextcloudpi-config.d/nc-nextcloud.sh +++ b/etc/nextcloudpi-config.d/nc-nextcloud.sh @@ -183,12 +183,8 @@ EOF echo "Don't forget to run nc-init" } -cleanup() -{ - rm -f /home/pi/.bash_history +cleanup(){ :; } - systemctl disable ssh -} # License # # This script is free software; you can redistribute it and/or modify it diff --git a/etc/nextcloudpi-config.d/nc-wifi.sh b/etc/nextcloudpi-config.d/nc-wifi.sh index e4583b6a..ae99a6c3 100644 --- a/etc/nextcloudpi-config.d/nc-wifi.sh +++ b/etc/nextcloudpi-config.d/nc-wifi.sh @@ -77,8 +77,6 @@ cleanup() apt-get autoremove -y apt-get clean rm /var/lib/apt/lists/* -r - rm -f /home/pi/.bash_history - systemctl disable ssh } # License diff --git a/etc/nextcloudpi-config.d/no-ip.sh b/etc/nextcloudpi-config.d/no-ip.sh index 70dbde7e..0e90ebc2 100644 --- a/etc/nextcloudpi-config.d/no-ip.sh +++ b/etc/nextcloudpi-config.d/no-ip.sh @@ -78,11 +78,7 @@ configure() sudo -u www-data php occ config:system:set overwrite.cli.url --value=https://"$DOMAIN_" } -cleanup() -{ - rm -f /home/pi/.bash_history - systemctl disable ssh -} +cleanup() { :; } # License # diff --git a/etc/nextcloudpi-config.d/samba.sh b/etc/nextcloudpi-config.d/samba.sh index b94d48ef..1493ee04 100644 --- a/etc/nextcloudpi-config.d/samba.sh +++ b/etc/nextcloudpi-config.d/samba.sh @@ -91,8 +91,6 @@ cleanup() apt-get autoremove -y apt-get clean rm /var/lib/apt/lists/* -r - rm -f /home/pi/.bash_history - systemctl disable ssh } # License diff --git a/etc/nextcloudpi-config.d/unattended-upgrades.sh b/etc/nextcloudpi-config.d/unattended-upgrades.sh index af2789a5..75320388 100644 --- a/etc/nextcloudpi-config.d/unattended-upgrades.sh +++ b/etc/nextcloudpi-config.d/unattended-upgrades.sh @@ -50,8 +50,6 @@ cleanup() apt-get autoremove -y apt-get clean rm /var/lib/apt/lists/* -r - rm -f /home/pi/.bash_history - systemctl disable ssh } # License |