diff options
| author | Daniel Hansson <daniel@techandme.se> | 2017-08-31 08:24:08 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-31 08:24:08 +0300 |
| commit | 417ded1093c9aa95f8dc42222fbbb64ff105f671 (patch) | |
| tree | c2cc71a795f4b025e31ceee4e6982d8b40e03653 /apps | |
| parent | 1a14a807b1ba6f6e0eff7645ce2d9ff5da2360d4 (diff) | |
various fixes (#356)
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/collabora.sh | 6 | ||||
| -rw-r--r-- | apps/fail2ban.sh | 6 | ||||
| -rw-r--r-- | apps/onlyoffice.sh | 6 |
3 files changed, 5 insertions, 13 deletions
diff --git a/apps/collabora.sh b/apps/collabora.sh index dee3cde5..20d31b10 100644 --- a/apps/collabora.sh +++ b/apps/collabora.sh @@ -261,12 +261,8 @@ fi # Install certbot (Let's Encrypt) install_certbot -# Stop Apache to aviod port conflicts -a2dissite 000-default.conf -sudo service apache2 stop - # Generate certs -if letsencrypt certonly --standalone --agree-tos --rsa-key-size 4096 -d "$SUBDOMAIN" +if le_subdomain then # Generate DHparams chifer if [ ! -f "$DHPARAMS" ] diff --git a/apps/fail2ban.sh b/apps/fail2ban.sh index 7c7bd14d..3650aebe 100644 --- a/apps/fail2ban.sh +++ b/apps/fail2ban.sh @@ -24,7 +24,7 @@ fi ### Local variables ### # location of Nextcloud logs -NCLOG="$(grep "logfile" $NCPATH/config/config.php | awk '{print $3}' | sed "s/[',]//g")" +NCLOG="$(find / -name nextcloud.log)" # time to ban an IP that exceeded attempts BANTIME_=600000 # cooldown time for incorrect passwords @@ -40,8 +40,8 @@ check_command update-rc.d fail2ban disable if [ -z "$NCLOG" ] then - echo "Logfile not found." - echo "Please add it to $NCPATH/config/config.php and run this script again." + echo "nextcloud.log not found" + echo "Please add your logpath to $NCPATH/config/config.php and restart this script." exit 1 else chown www-data:www-data "$NCLOG" diff --git a/apps/onlyoffice.sh b/apps/onlyoffice.sh index 98b8d002..a85eb0d5 100644 --- a/apps/onlyoffice.sh +++ b/apps/onlyoffice.sh @@ -251,12 +251,8 @@ fi # Install certbot (Let's Encrypt) install_certbot -# Stop Apache to aviod port conflicts -a2dissite 000-default.conf -sudo service apache2 stop - # Generate certs -if letsencrypt certonly --standalone --agree-tos --rsa-key-size 4096 -d "$SUBDOMAIN" +if le_subdomain then # Generate DHparams chifer if [ ! -f "$DHPARAMS" ] |