🚀 Release v0.5.1

CHANGELOG.md

@@ -3,7 +3,27 @@
 Below is a detailed change-log, along with specific tasks completed, for each
 version released to date.
 
-## Version 0.5.0 (30/05/2018)
+## Version 0.5.1 (09/06/2018)
+
+- [#enhancement](#enhancement)
+  - Included `thirdparty_install.sh` in `install`.
+  - `thirdparty_install.sh` changes:
+    - Removed the `git clone` commands for all as they are now submodules.
+  - Improved `cp` command in `git_setup.sh`
+- [#bugfix](#bugfix)
+  - Fixed output of echo message in:
+    - `install`
+    - `apache_config.sh`
+  - Set variables for hard coded paths in:
+    - `thirdparty_install.sh`
+    - `openssl_command.sh`
+    - `hosts_file.sh`
+  - Removed creation of `.gitignore` file as it overwrites the one from the
+    .github templates.
+  - Removed `''` preventing the output of the variable for `openssl.conf`.
+  - Removed the moving of folders in `git_setup.sh` as it isn't needed.
+
+## Version 0.5.0 (09/06/2018)
 
 - [#new](#new)
   - New `.travis.yml` file. Testing CI to ensure it all builds as expected.

add_domains

@@ -7,7 +7,7 @@
 # Copyright: Copyright (C) 2018 Justin Hartman (https://justin.hartman.me)
 # Author   : Justin Hartman <[email protected]> (https://justin.hartman.me)
 # License  : https://opensource.org/licenses/AGPL-3.0 AGPL-3.0
-# Version  : 0.5.0
+# Version  : 0.5.1
 # Link     : https://github.com/22digital/Automated-LAMP-trusted-localhost-SSL
 # Link     : https://justin.hartman.me
 # Since    : 0.1.0

brew

@@ -6,7 +6,7 @@
 # Copyright: Copyright (C) 2018 Justin Hartman (https://justin.hartman.me)
 # Author   : Justin Hartman <[email protected]> (https://justin.hartman.me)
 # License  : https://opensource.org/licenses/AGPL-3.0 AGPL-3.0
-# Version  : 0.5.0
+# Version  : 0.5.1
 # Link     : https://github.com/22digital/Automated-LAMP-trusted-localhost-SSL
 # Link     : https://justin.hartman.me
 # Since    : 0.5.0

install

@@ -6,7 +6,7 @@
 # Copyright: Copyright (C) 2018 Justin Hartman <[email protected]> (https://justin.hartman.me)
 # Author   : Justin Hartman <[email protected]> (https://justin.hartman.me)
 # License  : https://opensource.org/licenses/AGPL-3.0 AGPL-3.0
-# Version  : 0.5.0
+# Version  : 0.5.1
 # Link     : https://github.com/22digital/Automated-LAMP-trusted-localhost-SSL
 # Link     : https://justin.hartman.me
 # Since    : 0.4.0

scripts/apache_config.sh

@@ -5,7 +5,7 @@
 # Copyright: Copyright (C) 2018 Justin Hartman (https://justin.hartman.me)
 # Author   : Justin Hartman <[email protected]> (https://justin.hartman.me)
 # License  : https://opensource.org/licenses/AGPL-3.0 AGPL-3.0
-# Version  : 0.5.0
+# Version  : 0.5.1
 # Link     : https://github.com/22digital/Automated-LAMP-trusted-localhost-SSL
 # Link     : https://justin.hartman.me
 # Since    : 0.3.0

scripts/brew_install.sh

@@ -6,7 +6,7 @@
 # Copyright: Copyright (C) 2018 Justin Hartman (https://justin.hartman.me)
 # Author   : Justin Hartman <[email protected]> (https://justin.hartman.me)
 # License  : https://opensource.org/licenses/AGPL-3.0 AGPL-3.0
-# Version  : 0.5.0
+# Version  : 0.5.1
 # Link     : https://github.com/22digital/Automated-LAMP-trusted-localhost-SSL
 # Link     : https://justin.hartman.me
 # Since    : 0.2.0

scripts/colour_palette.sh

@@ -6,7 +6,7 @@
 # Copyright: Copyright (C) 2018 Justin Hartman (https://justin.hartman.me)
 # Author   : Justin Hartman <[email protected]> (https://justin.hartman.me)
 # License  : https://opensource.org/licenses/AGPL-3.0 AGPL-3.0
-# Version  : 0.5.0
+# Version  : 0.5.1
 # Link     : https://github.com/22digital/Automated-LAMP-trusted-localhost-SSL
 # Link     : https://justin.hartman.me
 # Since    : 0.4.0

scripts/enter_domain.sh

@@ -5,7 +5,7 @@
 # Copyright: Copyright (C) 2018 Justin Hartman <[email protected]> (https://justin.hartman.me)
 # Author   : Justin Hartman <[email protected]> (https://justin.hartman.me)
 # License  : https://opensource.org/licenses/AGPL-3.0 AGPL-3.0
-# Version  : 0.5.0
+# Version  : 0.5.1
 # Link     : https://github.com/22digital/Automated-LAMP-trusted-localhost-SSL
 # Link     : https://justin.hartman.me
 # Since    : 0.4.0

scripts/folder_and_git.sh

@@ -7,7 +7,7 @@
 # Copyright: Copyright (C) 2018 Justin Hartman <[email protected]> (https://justin.hartman.me)
 # Author   : Justin Hartman <[email protected]> (https://justin.hartman.me)
 # License  : https://opensource.org/licenses/AGPL-3.0 AGPL-3.0
-# Version  : 0.5.0
+# Version  : 0.5.1
 # Link     : https://github.com/22digital/Automated-LAMP-trusted-localhost-SSL
 # Link     : https://justin.hartman.me
 # Since    : 0.4.0
@@ -51,8 +51,6 @@ folder_and_git ()
     printf "\n${GRN}\xE2\x9C\x94${NOC} ${CYA}Successfully created folder in
   $websites/${domain}.${NOC}\n"
     git init $websites/${domain}
-    touch $websites/${domain}/.gitignore
-    echo ".git/" > $websites/${domain}/.gitignore
     ls -lha $websites/${domain}
     printf "\n${GRN}\xE2\x9C\x94${NOC} ${CYA}Successfully created folder and
   initialised git repo for ${domain}.${NOC}\n"

scripts/folder_permissions.sh

@@ -5,7 +5,7 @@
 # Copyright: Copyright (C) 2018 Justin Hartman <[email protected]> (https://justin.hartman.me)
 # Author   : Justin Hartman <[email protected]> (https://justin.hartman.me)
 # License  : https://opensource.org/licenses/AGPL-3.0 AGPL-3.0
-# Version  : 0.5.0
+# Version  : 0.5.1
 # Link     : https://github.com/22digital/Automated-LAMP-trusted-localhost-SSL
 # Link     : https://justin.hartman.me
 # Since    : 0.4.0

scripts/git_setup.sh

@@ -5,7 +5,7 @@
 # Copyright: Copyright (C) 2018 Justin Hartman <[email protected]> (https://justin.hartman.me)
 # Author   : Justin Hartman <[email protected]> (https://justin.hartman.me)
 # License  : https://opensource.org/licenses/AGPL-3.0 AGPL-3.0
-# Version  : 0.5.0
+# Version  : 0.5.1
 # Link     : https://github.com/22digital/Automated-LAMP-trusted-localhost-SSL
 # Link     : https://justin.hartman.me
 # Since    : 0.4.0
@@ -42,8 +42,7 @@ git_setup ()
     echo "|  git initial structure, files and check-in.  |" >&2
     echo "|                                              |" >&2
     echo -e " ---------------------------------------------- ${NOC}\n" >&2
-    cp -R $source/git/* $websites/${domain}/
-    mv $websites/${domain}/github $websites/${domain}/.github
+    cp -R $source/git $websites/${domain}
     ls -lha $websites/${domain}
     git add -A
     git commit -m "Created git structure, .github template and initial project commit."

scripts/globals.sh

@@ -5,7 +5,7 @@
 # Copyright: Copyright (C) 2018 Justin Hartman (https://justin.hartman.me)
 # Author   : Justin Hartman <[email protected]> (https://justin.hartman.me)
 # License  : https://opensource.org/licenses/AGPL-3.0 AGPL-3.0
-# Version  : 0.5.0
+# Version  : 0.5.1
 # Link     : https://github.com/22digital/Automated-LAMP-trusted-localhost-SSL
 # Link     : https://justin.hartman.me
 # Since    : 0.4.0

scripts/hosts_domain.sh

@@ -5,7 +5,7 @@
 # Copyright: Copyright (C) 2018 Justin Hartman <[email protected]> (https://justin.hartman.me)
 # Author   : Justin Hartman <[email protected]> (https://justin.hartman.me)
 # License  : https://opensource.org/licenses/AGPL-3.0 AGPL-3.0
-# Version  : 0.5.0
+# Version  : 0.5.1
 # Link     : https://github.com/22digital/Automated-LAMP-trusted-localhost-SSL
 # Link     : https://justin.hartman.me
 # Since    : 0.4.0

scripts/hosts_file.sh

@@ -6,7 +6,7 @@
 # Copyright: Copyright (C) 2018 Justin Hartman (https://justin.hartman.me)
 # Author   : Justin Hartman <[email protected]> (https://justin.hartman.me)
 # License  : https://opensource.org/licenses/AGPL-3.0 AGPL-3.0
-# Version  : 0.5.0
+# Version  : 0.5.1
 # Link     : https://github.com/22digital/Automated-LAMP-trusted-localhost-SSL
 # Link     : https://justin.hartman.me
 # Since    : 0.2.0
@@ -43,7 +43,7 @@ hosts_file_backup ()
     echo "|  Backup original hosts file '/etc/hosts'     |" >&2
     echo "|                                              |" >&2
     echo -e " ---------------------------------------------- ${NOC}\n" >&2
-    cp /etc/hosts dist/hosts/hosts.original
+    cp /etc/hosts $dist/hosts/hosts.original
     printf "${GRN}\xE2\x9C\x94${NOC} ${CYA}Successfully backed up hosts file.
     ${NOC}\n"
 }
@@ -67,8 +67,8 @@ hosts_symbolic ()
     echo "|  point to 'dist/hosts/hosts' file.                |" >&2
     echo "|                                              |" >&2
     echo -e " ---------------------------------------------- ${NOC}\n" >&2
-    ln -s /etc/hosts dist/hosts/hosts
-    ls -lh dist/hosts/hosts
+    ln -s /etc/hosts $dist/hosts/hosts
+    ls -lh $dist/hosts/hosts
     printf "\n${GRN}\xE2\x9C\x94${NOC} ${CYA}Successfully created symbolic link
   from '/etc/hosts' to 'dist/hosts/hosts'.${NOC}\n"
 }

scripts/keychain_certificate.sh

@@ -5,7 +5,7 @@
 # Copyright: Copyright (C) 2018 Justin Hartman <[email protected]> (https://justin.hartman.me)
 # Author   : Justin Hartman <[email protected]> (https://justin.hartman.me)
 # License  : https://opensource.org/licenses/AGPL-3.0 AGPL-3.0
-# Version  : 0.5.0
+# Version  : 0.5.1
 # Link     : https://github.com/22digital/Automated-LAMP-trusted-localhost-SSL
 # Link     : https://justin.hartman.me
 # Since    : 0.4.0

scripts/openssl_command.sh

@@ -5,7 +5,7 @@
 # Copyright: Copyright (C) 2018 Justin Hartman <[email protected]> (https://justin.hartman.me)
 # Author   : Justin Hartman <[email protected]> (https://justin.hartman.me)
 # License  : https://opensource.org/licenses/AGPL-3.0 AGPL-3.0
-# Version  : 0.5.0
+# Version  : 0.5.1
 # Link     : https://github.com/22digital/Automated-LAMP-trusted-localhost-SSL
 # Link     : https://justin.hartman.me
 # Since    : 0.4.0
@@ -45,7 +45,7 @@ openssl_command ()
     openssl req -new \
         -key $ssl/localhost_server.key \
         -out $ssl/localhost_server.csr \
-        -subj "/C=ZA/ST=Western Cape/L=Cape Town/O=22 Digital/OU=Security/CN=localhost"
+        -subj "/C=$country/ST=$state/L=$city/O=$company/OU=$unit/CN=localhost"
 
     openssl x509 -req \
         -in $ssl/localhost_server.csr \

scripts/openssl_config.sh

@@ -5,7 +5,7 @@
 # Copyright: Copyright (C) 2018 Justin Hartman <[email protected]> (https://justin.hartman.me)
 # Author   : Justin Hartman <[email protected]> (https://justin.hartman.me)
 # License  : https://opensource.org/licenses/AGPL-3.0 AGPL-3.0
-# Version  : 0.5.0
+# Version  : 0.5.1
 # Link     : https://github.com/22digital/Automated-LAMP-trusted-localhost-SSL
 # Link     : https://justin.hartman.me
 # Since    : 0.4.0
@@ -42,7 +42,7 @@ openssl_config ()
     echo "|  file.                                       |" >&2
     echo "|                                              |" >&2
     echo -e " ---------------------------------------------- ${NOC}\n" >&2
-    read serial <<< $(wc -l < '$ssl/openssl.conf' | tr -d ' ')
+    read serial <<< $(wc -l < $ssl/openssl.conf | tr -d ' ')
     serial=$((serial-11))
     echo "DNS.${serial}      =   ${domain}" >> $ssl/openssl.conf
     cat $ssl/openssl.conf | grep "DNS"

scripts/setup_ssl.sh

@@ -6,7 +6,7 @@
 # Copyright: Copyright (C) 2018 Justin Hartman <[email protected]> (https://justin.hartman.me)
 # Author   : Justin Hartman <[email protected]> (https://justin.hartman.me)
 # License  : https://opensource.org/licenses/AGPL-3.0 AGPL-3.0
-# Version  : 0.5.0
+# Version  : 0.5.1
 # Link     : https://github.com/22digital/Automated-LAMP-trusted-localhost-SSL
 # Link     : https://justin.hartman.me
 # Since    : 0.1.0

scripts/thirdparty_install.sh

@@ -5,7 +5,7 @@
 # Copyright: Copyright (C) 2018 Justin Hartman (https://justin.hartman.me)
 # Author   : Justin Hartman <[email protected]> (https://justin.hartman.me)
 # License  : https://opensource.org/licenses/AGPL-3.0 AGPL-3.0
-# Version  : 0.5.0
+# Version  : 0.5.1
 # Link     : https://github.com/22digital/Automated-LAMP-trusted-localhost-SSL
 # Link     : https://justin.hartman.me
 # Since    : 0.2.0
@@ -43,12 +43,12 @@ adminer_install ()
     echo "|  Installing the Adminer project...           |" >&2
     echo "|                                              |" >&2
     echo -e " ---------------------------------------------- ${NOC}\n" >&2
-    git clone https://github.com/justinhartman/adminer-custom.git \
-    /usr/local/var/www/adminer
-    ln -s /usr/local/var/www/adminer dist/adminer
+    mkdir -p $main/adminer
+    cp -R $source/adminer $main/adminer
+    ln -s $main/adminer $dist/adminer
     printf "\n${GRN}\xE2\x9C\x94${NOC} ${CYA}Successfully cloned the Adminer
   sub-module to /usr/local/var/www/adminer/ and created a symbolic link
-  to dist/adminer in the project folder..${NOC}\n"
+  to $dist/adminer in the project folder..${NOC}\n"
 }
 
 #######################################
@@ -70,14 +70,12 @@ errorpages_install ()
     echo "|  Installing the Apache Error Pages project...|" >&2
     echo "|                                              |" >&2
     echo -e " ---------------------------------------------- ${NOC}\n" >&2
-    git clone https://github.com/justinhartman/Apache-Error-Pages.git \
-    src/httpd/error-pages
-    mkdir -p /usr/local/var/www/error-pages
-    cp -R src/httpd/error-pages/dist/apache/* /usr/local/var/www/error-pages
-    ln -s /usr/local/var/www/error-pages dist/error-pages
+    mkdir -p $main/error-pages
+    cp -R $source/httpd/error-pages/dist/apache $main/error-pages
+    ln -s $main/error-pages $dist/error-pages
     printf "\n${GRN}\xE2\x9C\x94${NOC} ${CYA}Successfully cloned the Apache
-  Error Pages sub-module to /usr/local/var/www/error-pages and created a
-  symbolic link to dist/error-pages in the project folder.${NOC}\n"
+  Error Pages sub-module to $main/error-pages and created a
+  symbolic link to $dist/error-pages in the project folder.${NOC}\n"
 }
 
 #######################################
@@ -99,16 +97,18 @@ phpmyadmin_install ()
     echo "|  Installing the phpMyAdmin project...        |" >&2
     echo "|                                              |" >&2
     echo -e " ---------------------------------------------- ${NOC}\n" >&2
-  mkdir src/phpmyadmin
-  cd src/archives/
+  mkdir $source/phpmyadmin
+  cd $source/archives/
   wget https://files.phpmyadmin.net/phpMyAdmin/4.8.1/phpMyAdmin-4.8.1-all-languages.tar.gz
-  tar -zxvf phpMyAdmin-4.8.1-all-languages.tar.gz -C ../phpmyadmin --strip-components=1
+  tar -zxvf phpMyAdmin-4.8.1-all-languages.tar.gz \
+    -C $source/phpmyadmin \
+    --strip-components=1
   cd ../../
-  cp -R src/phpmyadmin /usr/local/var/www/phpmyadmin
-  ln -s /usr/local/var/www/phpmyadmin dist/phpmyadmin
+  cp -R $source/phpmyadmin $main/phpmyadmin
+  ln -s $main/phpmyadmin $dist/phpmyadmin
   printf "\n${GRN}\xE2\x9C\x94${NOC} ${CYA}Successfully installed the phpMyAdmin
-sub-module to /usr/local/var/www/phpmyadmin and created a
-symbolic link to dist/phpmyadmin in the project folder.${NOC}\n"
+sub-module to $main/phpmyadmin and created a
+symbolic link to $dist/phpmyadmin in the project folder.${NOC}\n"
 }
 
 #######################################

scripts/upgrade_software.sh

@@ -1,12 +1,11 @@
 #!/bin/bash
 #
-# Fully automated LAMP installation and configuration using Trusted localhost 
-# SSL Certificates
+# Upgrades the thirdparty software linked to the project.
 # 
 # Copyright: Copyright (C) 2018 Justin Hartman (https://justin.hartman.me)
 # Author   : Justin Hartman <[email protected]> (https://justin.hartman.me)
 # License  : https://opensource.org/licenses/AGPL-3.0 AGPL-3.0
-# Version  : 0.5.0
+# Version  : 0.5.1
 # Link     : https://github.com/22digital/Automated-LAMP-trusted-localhost-SSL
 # Link     : https://justin.hartman.me
 # Since    : 0.2.0

setup_localhost

@@ -6,7 +6,7 @@
 # Copyright: Copyright (C) 2018 Justin Hartman <[email protected]> (https://justin.hartman.me)
 # Author   : Justin Hartman <[email protected]> (https://justin.hartman.me)
 # License  : https://opensource.org/licenses/AGPL-3.0 AGPL-3.0
-# Version  : 0.5.0
+# Version  : 0.5.1
 # Link     : https://github.com/22digital/Automated-LAMP-trusted-localhost-SSL
 # Link     : https://justin.hartman.me
 # Since    : 0.1.0

tests/add_domains

@@ -7,7 +7,7 @@
 # Copyright: Copyright (C) 2018 Justin Hartman (https://justin.hartman.me)
 # Author   : Justin Hartman <[email protected]> (https://justin.hartman.me)
 # License  : https://opensource.org/licenses/AGPL-3.0 AGPL-3.0
-# Version  : 0.5.0
+# Version  : 0.5.1
 # Link     : https://github.com/22digital/Automated-LAMP-trusted-localhost-SSL
 # Link     : https://justin.hartman.me
 # Since    : 0.5.0

tests/brew

@@ -6,7 +6,7 @@
 # Copyright: Copyright (C) 2018 Justin Hartman (https://justin.hartman.me)
 # Author   : Justin Hartman <[email protected]> (https://justin.hartman.me)
 # License  : https://opensource.org/licenses/AGPL-3.0 AGPL-3.0
-# Version  : 0.5.0
+# Version  : 0.5.1
 # Link     : https://github.com/22digital/Automated-LAMP-trusted-localhost-SSL
 # Link     : https://justin.hartman.me
 # Since    : 0.5.0

tests/install

@@ -6,7 +6,7 @@
 # Copyright: Copyright (C) 2018 Justin Hartman <[email protected]> (https://justin.hartman.me)
 # Author   : Justin Hartman <[email protected]> (https://justin.hartman.me)
 # License  : https://opensource.org/licenses/AGPL-3.0 AGPL-3.0
-# Version  : 0.5.0
+# Version  : 0.5.1
 # Link     : https://github.com/22digital/Automated-LAMP-trusted-localhost-SSL
 # Link     : https://justin.hartman.me
 # Since    : 0.5.0
@@ -54,6 +54,7 @@ main_application ()
 {
     source $scripts/setup_ssl.sh # Setup self-signed SSL
     source $scripts/apache_config.sh # Configure Apache 2
+    source $scripts/thirdparty_install.sh # Install third-party tools
     source $scripts/folder_permissions.sh # Setting correct folder permissions
 
     echo "" >&2
@@ -62,7 +63,7 @@ main_application ()
     echo "|  Congratulations! You have successfully      |" >&2
     echo "|  setup your localhost configuration.         |" >&2
     echo "|  All the files you may need to edit are      |" >&2
-    echo "|  contained in the `/dist/` folder. This      |" >&2
+    echo "|  contained in the /dist/ folder. This        |" >&2
     echo "|  includes any website you add and access to  |" >&2
     echo "|  the ssl, adminer, phpmyadmin, error-pages   |" >&2
     echo "|  and hosts folder.                           |" >&2