diff --git a/README.md b/README.md index f3d5afb..e2d2be6 100644 --- a/README.md +++ b/README.md @@ -9,20 +9,7 @@ bash install.sh ``` - - -### mini_sendmail -``` -wget http://www.acme.com/software/mini_sendmail/mini_sendmail-1.3.6.tar.gz -tar zxvf mini_sendmail-1.3.6.tar.gz -cd mini_sendmail-1.3.6/ -make -cp mini_sendmail /usr/local/bin -gzip mini_sendmail.8 -cp mini_sendmail.8.gz /usr/local/share/man/man8 -``` - -# configure a minimal smtp server so automated emails (cron etc) can be sent +### configure a minimal smtp server so automated emails (cron etc) can be sent apt -y install exim4-daemon-light mailutils sed -i "s|dc_eximconfig_configtype='local'|dc_eximconfig_configtype='internet'|g" /etc/exim4/update-exim4.conf.conf /usr/sbin/update-exim4.conf diff --git a/install.sh b/install.sh index 1eb9f23..b665da8 100755 --- a/install.sh +++ b/install.sh @@ -22,12 +22,16 @@ fi # check for existing web server software installs if [ -d "/etc/apache2/" ] || [ -d "/etc/php/" ] || [ -d "/etc/varnish/" ]; then + echo echo "WARNING: Apache, Varnish and/or PHP are already installed." echo "This installer will overwrite existing configurations." echo -e "You have five seconds to execute ctrl-c to cancel this install.\a" + echo sleep 5 fi +apt-get update + # install pwgen, used to create random passwords apt -y install pwgen @@ -156,7 +160,6 @@ apt -y install php-bz2 php-tcpdf cd /usr/local/src wget https://files.phpmyadmin.net/phpMyAdmin/5.1.0/phpMyAdmin-5.1.0-all-languages.tar.gz tar zxf phpMyAdmin-5.1.0-all-languages.tar.gz -cd phpMyAdmin-5.1.0-all-languages rm -r phpMyAdmin-5.1.0-all-languages/setup/ phpMyAdmin-5.1.0-all-languages/test/ blowfish_secret=`pwgen 32 -1` echo ' phpMyAdmin-5.1.0-all-languages/config.inc.php