Merge branch 'master' into feature/55-dashboard

Author: waseemsadiq

.env

@@ -1,5 +1,5 @@
 ### Joomla
-JOOMLA_SITE=default
+JOOMLA_SITE=joomla
 JOOMLA_VERSION=latest
 
 ### Composer

.env.default

@@ -13,7 +13,7 @@ APP_ENV=production
 APP_USER=www-data
 
 # Defines if opcache is preloaded from APP_DATA (default)
-APP_PRELOAD=on
+APP_PRELOAD=off
 
 # Location of the Apache root (default)
 APP_ROOT=/var/www
@@ -25,16 +25,16 @@ APP_DATA=/srv/www
 APP_VOLUME=/mnt/www
 
 # Globally enable the application cache (default)
-APP_CACHE=1
+APP_CACHE=0
 
 # Globally enable application debug mode (default)
-APP_DEBUG=0
+APP_DEBUG=on
 
 # External HTTP port the app is listening on
-APP_HTTP=8080
+APP_HTTP=80
 
 # External HTTPS port the app is listening on
-APP_HTTPS=8443
+APP_HTTPS=443
 
 # Random number specific for the application (generated)
 APP_NONCE=

config/apache/sites-available/000-default.conf

@@ -1,11 +1,11 @@
-<VirtualHost *:8080>
+<VirtualHost *:8080 *:80>
 
     use vhost
     use site
 
 </VirtualHost>
 
-<VirtualHost *:8443>
+<VirtualHost *:8443 *:443>
 
     use ssl default
 

config/composer.json

@@ -19,7 +19,7 @@
     "michelf/php-markdown": "^1.9",
     "voku/html-min": "^4.0",
     "matthiasmullie/minify": "^1.3",
-    "joomlatools/console": "dev-master as 1.6.x-dev",
+    "joomlatools/console": "dev-feature/147-console2 as 1.6.x-dev",
     "joomlatools/framework": "dev-master as 3.5.x-dev",
     "joomlatools/pages": "dev-master as 0.22.x-dev"
   }

config/console/templates/apache-template.conf

@@ -1,12 +1,29 @@
 <VirtualHost *:%http_port%>
+
     ServerAdmin webmaster@%site%.test
+
     DocumentRoot %root%
+
     ServerName %site%.test
     ServerAlias www.%site%.test %site%.dev www.%site%.dev
 
-    <Directory %root%>
-       Options Indexes FollowSymLinks
-       AllowOverride All
-       Require all granted
-    </Directory>
+    Use site
+
 </VirtualHost>
+
+<IfModule mod_ssl.c>
+
+    <VirtualHost *:%ssl_port%>
+
+        ServerAdmin webmaster@%site%.test
+
+        DocumentRoot %root%
+
+        ServerName %site%.test
+        ServerAlias www.%site%.test %site%.dev www.%site%.dev
+
+        Use ssl default
+        Use site
+
+    </VirtualHost>
+</IfModule>

config/dnsmasq/dnsmasq.conf

@@ -0,0 +1,27 @@
+# Dnsmasq config, for a complete example, see:
+# http://oss.segetech.com/intra/srv/dnsmasq.conf
+
+# Dnsmasq will listen on loopback interface
+listen-address=0.0.0.0
+interface=eth0
+user=root
+
+#only use these namesservers
+no-resolv
+server=1.1.1.1
+server=1.0.0.1
+
+#Serve all .test queries using a specific nameserver
+address=/.test/127.0.0.1
+
+#Turn caching off. We just need Dnsmasq to forward queries
+cache-size=0
+
+# Do not cache negative responses
+no-negcache
+
+#Log all dns queries
+#log-queries
+
+# Send logging to stdout
+#log-facility=-

config/s6/cont-init.d/101-env.sh

@@ -10,7 +10,7 @@ printf "%s" $MYSQL_USER > /var/run/s6/container_environment/MYSQL_USER
 MYSQL_VOLUME=${MYSQL_VOLUME:=/mnt/www/mysql}
 printf "%s" $MYSQL_VOLUME > /var/run/s6/container_environment/MYSQL_VOLUME
 
-JOOMLA_SITE=${JOOMLA_SITE:=default}
+JOOMLA_SITE=${JOOMLA_SITE:=joomla}
 printf "%s" $JOOMLA_SITE > /var/run/s6/container_environment/JOOMLA_SITE
 
 JOOMLA_VERSION=${JOOMLA_VERSION:=latest}

config/s6/services.d/mysql/reload-signal

@@ -1 +1 @@
-SIGUP
+SIGHUP

config/s6/services.d/mysql/run

@@ -5,7 +5,7 @@
 # https://dev.mysql.com/doc/refman/8.0/en/unix-signal-response.html#server-signal-response
 # https://skarnet.org/software/s6/s6-svc.html
 
-# SIGUP: Reload the grant tables and to flush tables, logs, the thread cache, and the host cache
+# SIGHUP: Reload the grant tables and to flush tables, logs, the thread cache, and the host cache
 # > s6-svc -h /var/run/s6/services/mysql
 
 # SIGUSR2: Shutdown

config/scripts/joomla_install.sh

@@ -13,4 +13,7 @@ echo "* Creating the Joomla database"
 joomla database:install ${JOOMLA_SITE} --drop --mysql-login=root:
 
 echo "* Configuring Joomla"
-joomla site:configure ${JOOMLA_SITE} --overwrite --mysql-login=root:
+joomla site:configure ${JOOMLA_SITE} --overwrite --mysql-login=root:
+
+echo "* Creating vhost"
+joomla vhost:create ${JOOMLA_SITE} 

docker-compose.yml

@@ -12,6 +12,8 @@ services:
       - APP_DEBUG=on
       - APP_CACHE=off
       - APP_PRELOAD=off
+      - APP_HTTP=80
+      - APP_HTTPS=443
     build:
       context: .
       args:
@@ -39,8 +41,10 @@ services:
       #- ~/Projects/joomlatools-pages:/var/www/sites/[site]/libraries/joomlatools-components/pages/code
 
     ports:
-      - "8080:8080"  # HTTP Apache
-      - "8443:8443"  # HTTPS Apache
+      - "80:80"  # HTTP Apache
+      - "443:443"  # HTTPS Apache
+      #- "8080:8080"  # HTTP Apache
+      #- "8443:8443"  # HTTPS Apache
       - "3306:3306"    # MySQL
       - "33060:33060"  # MySQL - X Plugin
 
@@ -71,5 +75,22 @@ services:
     depends_on:
       - joomlatools-server
 
+  #docker compose --profile dnsmasq up
+  dnsmasq:
+    profiles: [ "dnsmasq" ]
+    image: 4km3/dnsmasq
+    container_name: dnsmasq
+    ports:
+      - "53:53/tcp"
+      - "53:53/udp"
+    cap_add:
+      - NET_ADMIN
+    depends_on:
+      - joomlatools-server
+    volumes:
+      - type: bind
+        source: ./config/dnsmasq/dnsmasq.conf
+        target: /etc/dnsmasq.conf
+
 volumes:
   mysql: