Remove the public subdirectory from being hardcoded in the new apache…

… site config file.
patrickcarlohickman · Jan 23, 2023 · 83c419e · 83c419e
1 parent c6269f7
commit 83c419e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
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 stub-vhost/stub-folder/public/
+  DocumentRoot stub-vhost/stub-folder/
   Options Indexes FollowSymLinks
 
-  <Directory "stub-vhost/stub-folder/public/">
+  <Directory "stub-vhost/stub-folder/">
     AllowOverride All
     <IfVersion < 2.4>
       Allow from all
@@ -31,14 +31,14 @@
 <VirtualHost *:443>
   ServerName stub-domain.test
   ServerAlias www.stub-domain.test
-  DocumentRoot stub-vhost/stub-folder/public/
+  DocumentRoot stub-vhost/stub-folder/
   Options Indexes FollowSymLinks
 
   SSLEngine on
   SSLCertificateFile "/etc/ssl/certs/ssl-cert-snakeoil.pem"
   SSLCertificateKeyFile "/etc/ssl/private/ssl-cert-snakeoil.key"
 
-  <Directory "stub-vhost/stub-folder/public/">
+  <Directory "stub-vhost/stub-folder/">
     AllowOverride All
     <IfVersion < 2.4>
       Allow from all

diff --git a/setup/resources/apache/make-site.sh b/setup/resources/apache/make-site.sh
@@ -7,7 +7,7 @@ function usage {
 }
 
 readonly NEW_SITE_DOMAIN="${1}"
-readonly NEW_SITE_DIRECTORY="${2:-${1}}"
+readonly NEW_SITE_DIRECTORY="${2:-${1}/public}"
 readonly NGROK_START_NAME="${3:-${1}}"
 
 readonly VHOST_DIRECTORY="${VHOST_DIRECTORY:-/var/www/vhost}"