mirrors/vm
2
0
Fork 0
mirror of https://github.com/nextcloud/vm.git synced 2025-10-26 11:27:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

some more smaller fixes (#620)

Browse Source
This commit is contained in:
Daniel Hansson 2018-08-09 15:45:48 +02:00 committed by GitHub
parent 642a795cee
commit 8d7af3a046
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 44 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apps/adminer.sh
View File

@ -2,6 +2,8 @@
# Tech and Me © - 2018, https://www.techandme.se/
echo "Installing and securing Adminer..."
# shellcheck disable=2034,2059
true
# shellcheck source=lib.sh
@ -30,9 +32,6 @@ fi
# Check distrobution and version
check_distro_version
echo "Installing and securing Adminer..."
echo
# Install Adminer
apt update -q4 & spinner_loading
install_if_not adminer

16
apps/collabora.sh
View File

@ -1,4 +1,9 @@
#!/bin/bash
# Tech and Me © - 2018, https://www.techandme.se/
echo "Installing Collabora..."
# shellcheck disable=2034,2059
true
# shellcheck source=lib.sh
@ -6,8 +11,6 @@ NC_UPDATE=1 && COLLABORA_INSTALL=1 . <(curl -sL https://raw.githubusercontent.co
unset NC_UPDATE
unset COLLABORA_INSTALL
# Tech and Me © - 2018, https://www.techandme.se/
# Check for errors + debug code and abort if something isn't right
# 1 = ON
# 0 = OFF
@ -32,9 +35,6 @@ You can't run OnlyOffice at the same time as you run Collabora."
exit 1
fi
echo "Installing Collabora..."
echo
# Notification
msg_box "Before you start, please make sure that port 80+443 is directly forwarded to this machine!"
@ -194,15 +194,13 @@ then
then
openssl dhparam -dsaparam -out "$DHPARAMS" 4096
fi
printf "${ICyan}\n"
printf "Certs are generated!\n"
printf "${Color_Off}\n"
printf "%b" "${IGreen}Certs are generated!\n${Color_Off}"
a2ensite "$SUBDOMAIN.conf"
restart_webserver
# Install Collabora App
occ_command app:install richdocuments
else
printf "${ICyan}\nIt seems like no certs were generated, please report this issue here: $ISSUES\n"
printf "%b" "${IRed}It seems like no certs were generated, please report this issue here: $ISSUES\n${Color_Off}"
any_key "Press any key to continue... "
restart_webserver
fi

4
apps/fail2ban.sh
View File

@ -3,6 +3,8 @@
# Tech and Me © - 2018, https://www.techandme.se/
# Inspired by https://github.com/nextcloud/nextcloudpi/blob/master/etc/nextcloudpi-config.d/fail2ban.sh
echo "Installing Fail2ban..."
# shellcheck disable=2034,2059
true
# shellcheck source=lib.sh
@ -31,8 +33,6 @@ FINDTIME_=1800
# failed attempts before banning an IP
MAXRETRY_=10
echo "Installing Fail2ban..."
apt update -q4 & spinner_loading
check_command apt install fail2ban -y
check_command update-rc.d fail2ban disable

5
apps/fulltextsearch.sh
View File

@ -3,6 +3,8 @@
# Tech and Me © - 2018, https://www.techandme.se/
# SwITNet Ltd © - 2018, https://switnet.net/
echo "Installing Elastic Search & Full Text Search on Nextcloud..."
# shellcheck disable=2034,2059
true
# shellcheck source=lib.sh
@ -37,9 +39,6 @@ If yes, revert all the settings and try again, it must be a clean install."
exit 1
fi
echo "Installing Elastic Search & Full Text Search on Nextcloud..."
echo
# Disable and remove Nextant + Solr
if [ -d "$NC_APPS_PATH"/nextant ]
then

3
apps/netdata.sh
View File

@ -15,9 +15,6 @@ true
DEBUG=0
debug_mode
echo "Installing Netdata..."
echo
# Download and install Netdata
if [ -d /etc/netdata ]
then

16
apps/onlyoffice.sh
View File

@ -1,4 +1,9 @@
#!/bin/bash
echo "Installing OnlyOffice..."
# Tech and Me © - 2018, https://www.techandme.se/
# shellcheck disable=2034,2059
true
# shellcheck source=lib.sh
@ -6,8 +11,6 @@ NC_UPDATE=1 && OO_INSTALL=1 . <(curl -sL https://raw.githubusercontent.com/nextc
unset NC_UPDATE
unset OO_INSTALL
# Tech and Me © - 2018, https://www.techandme.se/
# Check for errors + debug code and abort if something isn't right
# 1 = ON
# 0 = OFF
@ -32,9 +35,6 @@ You can't run Collabora at the same time as you run OnlyOffice."
exit 1
fi
echo "Installing OnlyOffice..."
echo
# Notification
msg_box "Before you start, please make sure that port 80+443 is directly forwarded to this machine!"
@ -183,16 +183,14 @@ then
then
openssl dhparam -dsaparam -out "$DHPARAMS" 4096
fi
printf "${ICyan}\n"
printf "Certs are generated!\n"
printf "${Color_Off}\n"
printf "%b" "${IGreen}Certs are generated!\n${Color_Off}"
a2ensite "$SUBDOMAIN.conf"
restart_webserver
# Install Onlyoffice App
cd "$NC_APPS_PATH"
check_command git clone https://github.com/ONLYOFFICE/onlyoffice-owncloud.git onlyoffice
else
printf "${ICyan}\nIt seems like no certs were generated, please report this issue here: $ISSUES\n"
printf "%b" "${IRed}It seems like no certs were generated, please report this issue here: $ISSUES\n${Color_Off}"
any_key "Press any key to continue... "
restart_webserver
fi

3
apps/previewgenerator.sh
View File

@ -1,4 +1,7 @@
#!/bin/bash
# Tech and Me © - 2018, https://www.techandme.se/
# shellcheck disable=2034,2059
true
# shellcheck source=lib.sh

5
apps/spreedme.sh
View File

@ -2,6 +2,8 @@
# Tech and Me © - 2018, https://www.techandme.se/
echo "Installing Spreed.ME..."
# shellcheck disable=2034,2059
true
# shellcheck source=lib.sh
@ -27,9 +29,6 @@ root_check
# Nextcloud 13 is required.
lowest_compatible_nc 13
echo "Installing Spreed.ME..."
echo
# Install if missing
install_if_not apache2
install_if_not snapd

4
apps/talk.sh
View File

@ -2,6 +2,8 @@
# Tech and Me © - 2018, https://www.techandme.se/
echo "Installing Nextcloud Talk..."
# shellcheck disable=2034,2059
true
# shellcheck source=lib.sh
@ -21,8 +23,6 @@ root_check
# Nextcloud 13 is required.
lowest_compatible_nc 13
echo "Installing Nextcloud Talk..."
# Check if Nextcloud is installed
echo "Checking if Nextcloud is installed..."
if ! curl -s https://"${TURN_DOMAIN//\\/}"/status.php | grep -q 'installed":true'

5
apps/webmin.sh
View File

@ -2,6 +2,8 @@
# Tech and Me © - 2018, https://www.techandme.se/
echo "Installing Webmin..."
# shellcheck disable=2034,2059
true
# shellcheck source=lib.sh
@ -16,9 +18,6 @@ debug_mode
# Check if root
root_check
echo "Installing Webmin..."
echo
# Install packages for Webmin
apt install -y zip perl libnet-ssleay-perl openssl libauthen-pam-perl libpam-runtime libio-pty-perl apt-show-versions python

6
lets-encrypt/activate-ssl.sh
View File

@ -243,15 +243,15 @@ attempts_left() {
local method="$1"
if [ "$method" == "standalone" ]
then
printf "${ICyan}It seems like no certs were generated, we will do 2 more tries.${Color_Off}\n"
printf "%b" "${ICyan}It seems like no certs were generated, we will do 2 more tries.\n${Color_Off}"
any_key "Press any key to continue..."
elif [ "$method" == "webroot" ]
then
printf "${ICyan}It seems like no certs were generated, we will do 1 more try.${Color_Off}\n"
printf "%b" "${ICyan}It seems like no certs were generated, we will do 1 more tries.\n${Color_Off}"
any_key "Press any key to continue..."
elif [ "$method" == "dns" ]
then
printf "${ICyan}It seems like no certs were generated, we will do 0 more tries.${Color_Off}\n"
printf "%b" "${IRed}It seems like no certs were generated, please check your DNS and try again.\n${Color_Off}"
any_key "Press any key to continue..."
fi
}

4
static/change-root-profile.sh
View File

@ -43,7 +43,7 @@ ROOT-PROFILE
# Add Aliases
{
echo alias nextcloud_occ="sudo -u www-data php $NCPATH/occ"
echo alias run_update_nextcloud="bash $SCRIPTS/update.sh"
echo "alias nextcloud_occ='sudo -u www-data php $NCPATH/occ'"
echo "alias run_update_nextcloud='bash $SCRIPTS/update.sh'"
} > /root/.bash_aliases

18
static/modsecurity.sh
View File

@ -1,4 +1,9 @@
#!/bin/bash
# Tech and Me © - 2018, https://www.techandme.se/
echo "Installing ModSecurity..."
# shellcheck disable=2034,2059
true
# shellcheck source=lib.sh
@ -13,9 +18,6 @@ debug_mode
# Check if root
root_check
echo "Installing ModSecurity..."
echo
# Add modsecurity
apt update -q4 & spinner_loading
install_if_not libapache2-mod-security2
@ -31,7 +33,7 @@ tail -f /var/log/apache2/modsec_audit.log
You can disable it by typing this command in your shell:
sed -i 's/SecRuleEngine .*/SecRuleEngine DetectionOnly/g' /etc/modsecurity/modsecurity.conf
You have been warnned."
You have been warned."
if [[ "yes" == $(ask_yes_or_no "Do you want to enable active defence?") ]]
then
sed -i 's|SecRuleEngine .*|SecRuleEngine on|g' /etc/modsecurity/modsecurity.conf
@ -81,10 +83,10 @@ cat << MODSECWHITE > "/etc/modsecurity/whitelist.conf"
MODSECWHITE
# Don't log in Apache2 error.log, only in a seperate log (/var/log/apache2/modsec_audit.log)
check command sed -i 's|SecDefaultAction "phase:1,log,auditlog,pass"|# SecDefaultAction "phase:1,log,auditlog,pass"|g' /etc/modsecurity/crs/crs-setup.conf
check command sed -i 's|SecDefaultAction "phase:2,log,auditlog,pass"|# SecDefaultAction "phase:2,log,auditlog,pass"|g' /etc/modsecurity/crs/crs-setup.conf
check command sed -i 's|# SecDefaultAction "phase:1,nolog,auditlog,pass"|SecDefaultAction "phase:1,nolog,auditlog,pass"|g' /etc/modsecurity/crs/crs-setup.conf
check command sed -i 's|# SecDefaultAction "phase:2,nolog,auditlog,pass"|SecDefaultAction "phase:2,nolog,auditlog,pass"|g' /etc/modsecurity/crs/crs-setup.conf
check_command sed -i 's|SecDefaultAction "phase:1,log,auditlog,pass"|# SecDefaultAction "phase:1,log,auditlog,pass"|g' /etc/modsecurity/crs/crs-setup.conf
check_command sed -i 's|SecDefaultAction "phase:2,log,auditlog,pass"|# SecDefaultAction "phase:2,log,auditlog,pass"|g' /etc/modsecurity/crs/crs-setup.conf
check_command sed -i 's|# SecDefaultAction "phase:1,nolog,auditlog,pass"|SecDefaultAction "phase:1,nolog,auditlog,pass"|g' /etc/modsecurity/crs/crs-setup.conf
check_command sed -i 's|# SecDefaultAction "phase:2,nolog,auditlog,pass"|SecDefaultAction "phase:2,nolog,auditlog,pass"|g' /etc/modsecurity/crs/crs-setup.conf
if [ -f /etc/modsecurity/whitelist.conf ]
then

2
static/security.sh
View File

@ -3,7 +3,6 @@
# Tech and Me © - 2018, https://www.techandme.se/
# REMOVE disable of SC2154 WHEN PUTTING SPAMHAUS IN PRODUCTION (it's just to fixing travis for now)
# shellcheck disable=2034,2059,SC2154
true
# shellcheck source=lib.sh
@ -19,7 +18,6 @@ debug_mode
root_check
echo "Installing Extra Security..."
echo
# Based on: http://www.techrepublic.com/blog/smb-technologist/secure-your-apache-server-from-ddos-slowloris-and-dns-injection-attacks/