Update the apache install and related scripts to allow the vhost dire…

…ctory to be configurable.
patrickcarlohickman · Jan 23, 2023 · c6269f7 · c6269f7
1 parent 6618d74
commit c6269f7
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 4 deletions.
diff --git a/setup/.env.example b/setup/.env.example
@@ -22,6 +22,9 @@ SSH_EMAIL_ADDRESS=
 GIT_USER_NAME=
 GIT_EMAIL_ADDRESS=
 
+# install-apache.sh
+VHOST_DIRECTORY="/var/www/vhost"
+
 # install-mysql.sh
 MYSQL_ROOT_PASSWORD=
 MYSQL_USER_NAME=

diff --git a/setup/installers/install-apache.sh b/setup/installers/install-apache.sh
@@ -7,6 +7,7 @@ ensure_not_installed "Apache"
 ensure_variable_set "WSL_USER"
 
 readonly WSL_USER
+readonly VHOST_DIRECTORY="${VHOST_DIRECTORY:-/var/www/vhost}"
 
 log_info "Installing Apache. This may take a few minutes..."
 
@@ -27,6 +28,13 @@ a2enmod headers
 a2enmod rewrite
 a2enmod expires
 
+log_info "Creating vhost directory."
+
+if [[ ! -d "${VHOST_DIRECTORY}" ]]; then
+  mkdir -p "${VHOST_DIRECTORY}"
+  chmod 777 "${VHOST_DIRECTORY}"
+fi
+
 log_info "Enabling all available sites."
 
 # Add this file so that all available sites are automatically enabled.

diff --git a/setup/resources/apache/apache-site-stub.conf b/setup/resources/apache/apache-site-stub.conf
@@ -1,10 +1,10 @@
 <VirtualHost *:80>
   ServerName stub-domain.test
   ServerAlias www.stub-domain.test
-  DocumentRoot /var/www/vhost/stub-folder/public/
+  DocumentRoot stub-vhost/stub-folder/public/
   Options Indexes FollowSymLinks
 
-  <Directory "/var/www/vhost/stub-folder/public/">
+  <Directory "stub-vhost/stub-folder/public/">
     AllowOverride All
     <IfVersion < 2.4>
       Allow from all
@@ -31,14 +31,14 @@
 <VirtualHost *:443>
   ServerName stub-domain.test
   ServerAlias www.stub-domain.test
-  DocumentRoot /var/www/vhost/stub-folder/public/
+  DocumentRoot stub-vhost/stub-folder/public/
   Options Indexes FollowSymLinks
 
   SSLEngine on
   SSLCertificateFile "/etc/ssl/certs/ssl-cert-snakeoil.pem"
   SSLCertificateKeyFile "/etc/ssl/private/ssl-cert-snakeoil.key"
 
-  <Directory "/var/www/vhost/stub-folder/public/">
+  <Directory "stub-vhost/stub-folder/public/">
     AllowOverride All
     <IfVersion < 2.4>
       Allow from all

diff --git a/setup/resources/apache/make-site.sh b/setup/resources/apache/make-site.sh
@@ -10,9 +10,11 @@ readonly NEW_SITE_DOMAIN="${1}"
 readonly NEW_SITE_DIRECTORY="${2:-${1}}"
 readonly NGROK_START_NAME="${3:-${1}}"
 
+readonly VHOST_DIRECTORY="${VHOST_DIRECTORY:-/var/www/vhost}"
 readonly SITES_DIRECTORY="/etc/apache2/sites-available"
 readonly STUB_FILENAME="apache-site-stub.conf"
 readonly STUB_DOMAIN_PLACEHOLDER="stub-domain"
+readonly STUB_VHOST_DIRECTORY_PLACEHOLDER="stub-vhost"
 readonly STUB_DIRECTORY_PLACEHOLDER="stub-folder"
 readonly NGROK_DIRECTORY="${NGROK_DIRECTORY:-/opt/ngrok}"
 readonly NGROK_CONFIG="${NGROK_DIRECTORY}/conf/ngrok.yml"
@@ -35,6 +37,7 @@ cp "${STUB_FILE}" "${NEW_SITE_CONFIG}"
 
 # Replace the stub placeholders with the new site values.
 sed -i "s#${STUB_DOMAIN_PLACEHOLDER}#${NEW_SITE_DOMAIN}#g" "${NEW_SITE_CONFIG}"
+sed -i "s#${STUB_VHOST_DIRECTORY_PLACEHOLDER}#${VHOST_DIRECTORY}#g" "${NEW_SITE_CONFIG}"
 sed -i "s#${STUB_DIRECTORY_PLACEHOLDER}#${NEW_SITE_DIRECTORY}#g" "${NEW_SITE_CONFIG}"
 
 # Make sure the DocumentRoot directory of the new site actually exists.