1.0.2: Added ability to backup and restore web config and ssl certs

Author: mfrancis-demac

.gitignore

@@ -2,6 +2,6 @@
 .idea
 .vagrant
 /www
-/mysql_backups
-/mysql_data
+/backup
+/mysql
 /config.yml

files/00-aliases.sh

@@ -76,24 +76,41 @@ function backupMysql {
         ;;
       *)
         echo "Dumping database: $db"
-        mysqldump -uroot --databases $db | gzip > /srv/mysql_backups/$db.sql.gz
+        mysqldump -uroot --databases $db | gzip > /srv/backup/mysql/$db.sql.gz
         ;;
     esac
   done
-  pt-show-grants -uroot -proot | gzip > /srv/mysql_backups/mysql_users.sql.gz
+  pt-show-grants -uroot -proot | gzip > /srv/backup/mysql/mysql_users.sql.gz
   export MYSQL_PWD=''
 }
 
 function restoreMysql {
   export MYSQL_PWD='root'
-  databases=`ls -1 backupdbs.*.sql`
+  databases=`ls -1 /srv/backup/mysql/*.sql.gz`
   for db in $databases; do
     echo "Importing $db ..."
-    zcat $db | mysql -u $USER
+    zcat $db | mysql -u root
   done
   export MYSQL_PWD=''
 }
 
+function backupWebconfig {
+  if [ -f /srv/backup/webconfig/config.tar ]; then
+    rm -f /srv/backup/webconfig/config.tar
+  fi
+  tar -cf /srv/backup/webconfig/config.tar /etc/apache2/sites-available/200-* /etc/apache2/sites-enabled/200-* /etc/apache2/ssl
+}
+
+function restoreWebconfig {
+  if [ -f /srv/backup/webconfig/config.tar ]; then
+    cd /
+    sudo tar -xf /srv/backup/webconfig/config.tar
+    cd -
+  else 
+    echo "Error - no /srv/backup/webconfig/config.tar file is present. You need to execute backupWebconfig first."
+  fi
+}
+
 function phpRestart() {
   source /vagrant/php_versions.sh
   for i in "${php_versions[@]}"; do

files/vhost.sh

@@ -175,7 +175,7 @@ function add_vhost {
         #chown USER:USER $DocumentRoot #POSSIBLE IMPLEMENTATION, new flag -u ?
     fi
 
-    create_vhost > /etc/apache2/sites-available/${ServerName}.conf
+    create_vhost > /etc/apache2/sites-available/200-${ServerName}.conf
 
     # Make directory to place SSL Certificate if it doesn't exists
     if [[ ! -d $KeyPath ]]; then
@@ -198,10 +198,10 @@ function add_vhost {
         fi
     fi
 
-    create_ssl_vhost >> /etc/apache2/sites-available/${ServerName}.conf
+    create_ssl_vhost >> /etc/apache2/sites-available/200-${ServerName}.conf
 
     # Enable Site
-    cd /etc/apache2/sites-available/ && a2ensite ${ServerName}.conf
+    cd /etc/apache2/sites-available/ && a2ensite 200-${ServerName}.conf
 
     # Add entry to hosts
     if ! grep -q "127.0.0.1 $ServerName" /etc/hosts ; then
@@ -211,14 +211,14 @@ function add_vhost {
 }
 
 function remove_vhost {
-    if [ ! -f "/etc/apache2/sites-available/$ServerName.conf" ]; then
+    if [ ! -f "/etc/apache2/sites-available/200-$ServerName.conf" ]; then
         echo "vHost $ServerName not found. Aborting"
         show_usage
     fi
-    if [ -f "/etc/apache2/sites-enabled/$ServerName.conf" ]; then
-        cd /etc/apache2/sites-available/ && a2dissite ${ServerName}.conf
+    if [ -f "/etc/apache2/sites-enabled/200-$ServerName.conf" ]; then
+        cd /etc/apache2/sites-available/ && a2dissite 200-${ServerName}.conf
     fi
-    rm /etc/apache2/sites-available/${ServerName}.conf
+    rm /etc/apache2/sites-available/200-${ServerName}.conf
     service apache2 reload
 }
 
@@ -315,7 +315,7 @@ elif [ "$Task" = "add" ] ; then
     elif [ "$CertPath" == "" ] && [ "$KeyPath" != "" ]; then
         echo 'When supplying KeyPath, CertPath must also be supplied!! Aborting'
         show_usage
-    elif [ -f "/etc/apache2/sites-available/$ServerName.conf" ]; then
+    elif [ -f "/etc/apache2/sites-available/200-$ServerName.conf" ]; then
         if confirm "vHost $ServerName already exists. Remove and Recreate? [y/N]" ; then
             remove_vhost
         else

files/welcome.txt

@@ -7,13 +7,12 @@ The following functions and aliases are available:
 \e[1mGENERAL:\e[0;32m
   mem               - Shows percentage of memory you have remaining in this VM environment
   vhelp             - Displays this help message
-  www               - Changes to the /srv/www directory
 
 
 \e[1mMYSQL:\e[0;32m
-  backupMysql       - Makes a dump of all your mysql databases and users into /srv/mysql_backups.
+  backupMysql       - Makes a dump of all your mysql databases and users into /srv/backup/mysql
                       This is shared on your host machine so will survive a \e[33mvagrant destroy\e[0;32m
-  restoreMysql      - Restores all your mysql databases and users from /srv/mysql_backups.
+  restoreMysql      - Restores all your mysql databases and users from /srv/backup/mysql.
                       This is shared on your host machine so will survive a \e[33mvagrant destroy\e[0;32m
 
 \e[1mMAGENTO:\e[0;32m
@@ -33,4 +32,13 @@ The following functions and aliases are available:
   xdebug 0|1        - Enables / Disables xdebug for all installed PHP versions (switching off saves time and memory)
 
   The following PHP versions are available with this release and may be invoked in shell via their aliases:
-###php_versions###\e[0m
+###php_versions###\e[0;32m
+
+\e[1mWEB:\e[0;32m
+  backupWebConfig   - Makes a dump of all your VHost configuration settings and SSL certificates into /srv/backup
+                      This is shared on your host machine so will survive a \e[33mvagrant destroy\e[0;32m
+  restoreWebConfig  - Restores all of your VHost configuration settings and SSL certificates from /srv/backup
+                      This is shared on your host machine so will survive a \e[33mvagrant destroy\e[0;32m
+  www               - Changes to the /srv/www directory
+
+\e[0m

scripts/000-setup_environment.sh

@@ -36,6 +36,10 @@ while IFS='' read -r line || [[ -n "$line" ]]; do
   fi
 done </vagrant/files/hosts.txt
 
+# Create backup folders for mysql and web config
+mkdir -f /srv/backup/mysql
+mkdir -f /srv/backup/webconfig
+
 # Copy bash aliases and welcome message for all users
 cp /vagrant/files/00-aliases.sh /etc/profile.d/
 cp /vagrant/files/99-welcome.sh /etc/profile.d/

scripts/100-setup_apache.sh

@@ -13,12 +13,14 @@ a2enmod rewrite actions ssl headers
 a2enmod proxy_fcgi
 a2enmod proxy_http
 
-#Change Listen Port
+# Change Listen Port
 sed -i.bak 's/Listen 80$/Listen 8090/' /etc/apache2/ports.conf
 
-#Change user and groups to vagrant
+# Change user and groups to vagrant
 sed -i.bak 's/www-data$/vagrant/' /etc/apache2/envvars
 
+rm /etc/apache2/sites-available/default-ssl.conf
+
 # Setup VHOST Script
 yes | cp -rf /vagrant/files/vhost.sh /usr/local/bin/vhost
 chmod +x /usr/local/bin/vhost

scripts/400-setup_mysql.sh

@@ -22,12 +22,12 @@ if [ ! -f /etc/init.d/mysql* ]; then
 
     sed -i "s/bind-address.*/bind-address    = 0.0.0.0/"           /etc/mysql/my.cnf
     sed -i "s/max_allowed_packet.*/max_allowed_packet      = 64M/" /etc/mysql/my.cnf
-    sed -i "s/datadir.*/datadir         = \/srv\/mysql_data/"      /etc/mysql/my.cnf
-    if [ ! -d /srv/mysql_data/mysql ]; then
-        echo "Moving mysql databases from /var/lib/mysql/ to /srv/mysql_data ..."
-        mv /var/lib/mysql/* /srv/mysql_data
+    sed -i "s/datadir.*/datadir         = \/srv\/mysql/data/"      /etc/mysql/my.cnf
+    if [ ! -d /srv/mysql/data/mysql ]; then
+        echo "Moving mysql databases from /var/lib/mysql/ to /srv/mysql/data ..."
+        mv /var/lib/mysql/* /srv/mysql/data
     else
-        echo "Not moving mysql databases from /var/lib/mysql/ to /srv/mysql_data since data is already present there"
+        echo "Not moving mysql databases from /var/lib/mysql/ to /srv/mysql/data since data is already present there"
     fi
     service mysql start
     export MYSQL_PWD='root'

scripts/600-setup_mail.sh

@@ -41,9 +41,9 @@ EOL
     sudo service mailhog start
 fi
 
-if [ ! -f /etc/apache2/sites-available/mailhog.demacmedia.com.conf ]; then
+if [ ! -f /etc/apache2/sites-available/100-mailhog.demacmedia.com.conf ]; then
     # Add Vhost
-    sudo tee /etc/apache2/sites-available/mailhog.demacmedia.com.conf <<EOL
+    sudo tee /etc/apache2/sites-available/100-mailhog.demacmedia.com.conf <<EOL
 <VirtualHost *:8090>
   ProxyPreserveHost On
   ProxyRequests Off
@@ -54,7 +54,7 @@ if [ ! -f /etc/apache2/sites-available/mailhog.demacmedia.com.conf ]; then
 EOL
 
     # Enable Vhost
-    sudo a2ensite mailhog.demacmedia.com
+    sudo a2ensite 100-mailhog.demacmedia.com
 
     # Reload apache
     sudo service apache2 reload