Merge branch 'master' into feature/55-dashboard

joomlatools · May 27, 2022 · 3a91c10 · 3a91c10
2 parents dbea5e6 + 0623c5d
commit 3a91c10
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 14 deletions.
diff --git a/config/console/templates/apache-template.conf b/config/console/templates/apache-template.conf
@@ -7,6 +7,7 @@
     ServerName %site%.test
     ServerAlias www.%site%.test %site%.dev www.%site%.dev
 
+    Use vhost
     Use site
 
 </VirtualHost>
@@ -23,6 +24,8 @@
         ServerAlias www.%site%.test %site%.dev www.%site%.dev
 
         Use ssl default
+
+        Use vhost
         Use site
 
     </VirtualHost>

diff --git a/config/s6/cont-init.d/101-env.sh b/config/s6/cont-init.d/101-env.sh
@@ -13,13 +13,13 @@ printf "%s" $MYSQL_PASS > /var/run/s6/container_environment/MYSQL_PASS
 MYSQL_VOLUME=${MYSQL_VOLUME:=/mnt/www/mysql}
 printf "%s" $MYSQL_VOLUME > /var/run/s6/container_environment/MYSQL_VOLUME
 
-JOOMLA_SITE=${JOOMLA_SITE:=joomla}
+JOOMLA_SITE=${JOOMLA_SITE:=}
 printf "%s" $JOOMLA_SITE > /var/run/s6/container_environment/JOOMLA_SITE
 
 JOOMLA_VERSION=${JOOMLA_VERSION:=latest}
 printf "%s" $JOOMLA_VERSION > /var/run/s6/container_environment/JOOMLA_VERSION
 
-WORDPRESS_SITE=${WORDPRESS_SITE:=wordpress}
+WORDPRESS_SITE=${WORDPRESS_SITE:=}
 printf "%s" $WORDPRESS_SITE > /var/run/s6/container_environment/WORDPRESS_SITE
 
 WORDPRESS_VERSION=${WORDPRESS_VERSION:=latest}

diff --git a/config/s6/mysql-init.d/102-joomla.sh b/config/s6/mysql-init.d/102-joomla.sh
@@ -1,21 +1,12 @@
 #!/bin/bash
 
 DIR=${APP_ROOT:=/var/www}/sites/${JOOMLA_SITE}
-if [[ ! -d $DIR ]];
+if [[ ! -d $DIR ]] && [[ ! -z "${JOOMLA_SITE}" ]];
 then
   echo "Installing Joomla..."
 
-  echo "* Downloading Joomla"
-  joomla site:download ${JOOMLA_SITE} --release=${JOOMLA_VERSION}
+  joomla site:create ${JOOMLA_SITE} --release=${JOOMLA_VERSION}
 
-  echo "* Creating the Joomla database"
-  joomla database:install ${JOOMLA_SITE} --drop
-
-  echo "* Configuring Joomla"
-  joomla site:configure ${JOOMLA_SITE} --overwrite
-
-  echo "* Creating vhost"
-  joomla vhost:create ${JOOMLA_SITE} 
 else
   echo "Installing Joomla... skipped"
 fi
diff --git a/config/s6/mysql-init.d/103-wordpress.sh b/config/s6/mysql-init.d/103-wordpress.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 DIR=${APP_ROOT:=/var/www}/sites/${WORDPRESS_SITE}
-if [[ ! -d $DIR ]];
+if [[ ! -d $DIR ]] && [[ ! -z "${WORDPRESS_SITE}" ]];
 then
   echo "Installing Wordpress..."