Converted apache

apache/Dockerfile

@@ -1,45 +1,9 @@
-FROM robinthoni/debian-multiarch:jessie
+FROM php:7-apache-stretch
 
-# FROM https://github.com/ZHAJOR/Docker-Apache-2.4-Php-5.6-for-Laravel
-MAINTAINER Robin Thoni <robin@rthoni.com>
+ADD https://raw.githubusercontent.com/robin-thoni/docker-utils/v1.0.0/setup.sh /tmp/docker-utils-setup.sh
+RUN sh /tmp/docker-utils-setup.sh
 
-ARG CONFIG_DIR=/etc/default/config-files/
+COPY ./config /etc/salt/base/
+COPY ./bin /usr/local/bin/
 
-RUN apt-get update && apt-get -y install\
-        apache2=2.4.*\
-        libapache2-mod-php5\
-        php5\
-        php5-mcrypt\
-        php5-pgsql\
-        php5-mysql\
-        php5-gd\
-        php5-curl\
-        php5-imap &&\
-        apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
-
-RUN /usr/sbin/a2enmod rewrite &&\
-    rm -rf /var/www/html &&\
-    mkdir -p /var/lock/apache2 /var/run/apache2 /var/log/apache2 /var/www/html &&\
-    chown -R www-data:www-data /var/lock/apache2 /var/run/apache2 /var/log/apache2 /var/www/html
-
-RUN rm -rf /var/log/* &&\
-    mkdir -p /var/log/apache2 &&\
-    ln -s /dev/stderr /var/log/apache2/error.log &&\
-    ln -s /dev/stdout /var/log/apache2/access.log &&\
-    ln -s /dev/stdout /var/log/apache2/other_vhosts_access.log
-
-COPY ./vars-vars /etc/vars-vars
-
-COPY ./vars-files /etc/vars-files
-
-COPY ./common.sh /common.sh
-
-COPY ./run.sh /run.sh
-
-RUN mkdir "${CONFIG_DIR}"
-
-COPY apache2.conf "${CONFIG_DIR}"/apache2.conf
-
-EXPOSE 80
-
-CMD ["/run.sh"]
+ENTRYPOINT ["run.sh"]

apache/apache2.conf

@@ -1,61 +0,0 @@
-# see http://sources.debian.net/src/apache2/2.4.10-1/debian/config-dir/apache2.conf
-
-ServerName netboot
-
-Mutex file:/var/lock/apache2 default
-PidFile /var/run/apache2/apache2.pid
-Timeout 300
-KeepAlive On
-MaxKeepAliveRequests 100
-KeepAliveTimeout 5
-User www-data
-Group www-data
-HostnameLookups Off
-ErrorLog /var/log/apache2/error.log
-LogLevel warn
-
-IncludeOptional mods-enabled/*.load
-IncludeOptional mods-enabled/*.conf
-
-# ports.conf
-Listen 80
-<IfModule ssl_module>
-    Listen 443
-</IfModule>
-<IfModule mod_gnutls.c>
-    Listen 443
-</IfModule>
-
-DocumentRoot "/var/www/"
-
-<Directory />
-    Options FollowSymLinks
-    AllowOverride None
-    Require all denied
-</Directory>
-
-<Directory /var/www/>
-    Options FollowSymLinks
-    AllowOverride All
-    Require all granted
-</Directory>
-
-
-
-LogFormat "%v:%p %h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" vhost_combined
-LogFormat "%h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" combined
-LogFormat "%h %l %u %t \"%r\" %>s %O" common
-LogFormat "%{Referer}i -> %U" referer
-LogFormat "%{User-agent}i" agent
-
-CustomLog /var/log/apache2/access.log combined
-
-<FilesMatch \.php$>
-    SetHandler application/x-httpd-php
-</FilesMatch>
-
-# Multiple DirectoryIndex directives within the same context will add
-# to the list of resources to look for rather than replace
-# https://httpd.apache.org/docs/current/mod/mod_dir.html#directoryindex
-DirectoryIndex disabled
-DirectoryIndex index.php index.html

apache/bin/run.sh

@@ -0,0 +1,5 @@
+#! /bin/bash
+
+gcf || exit 1
+
+docker-php-entrypoint apache2-foreground

apache/common.sh

@@ -1,41 +0,0 @@
-export CONFIG_DIR="/etc/default/config-files/"
-
-resolv_host()
-{
-  hostname="${1}"
-  ip=$(getent hosts "${hostname}" | cut -d' ' -f1)
-  echo "${ip}"
-}
-
-replace_var()
-{
-  file="${1}"
-  var="${2}"
-  sed -e "s?${var}?${!var}?g" -i "${file}"
-}
-
-replace_vars()
-{
-  file="${1}"
-  for var in $(cat /etc/vars-vars)
-  do
-    replace_var "${file}" "${var}"
-  done
-}
-
-replace_files()
-{
-  cat /etc/vars-files | while read line
-  do
-    filesrc="${CONFIG_DIR}$(echo "${line}" | awk '{print $1}')"
-    filedst=$(echo "${line}" | awk '{print $2}')
-    if [ -f "${filesrc}" ]
-    then
-      echo "Expanding file ${filesrc} to ${filedst}"
-      cp "${filesrc}" "${filedst}"
-      replace_vars "${filedst}"
-    else
-      echo "File ${filesrc} does not exist. Skipping."
-    fi
-  done
-}

apache/config/states/apache2/init.sls

@@ -0,0 +1,7 @@
+apache2-config:
+  file.blockreplace:
+      - name: /etc/apache2/apache2.conf
+      - append_if_not_found: True
+      - content: |
+                   ServerName netboot
+                   AddType application/x-httpd-php .ipxe

apache/run.sh

@@ -1,8 +0,0 @@
-#! /usr/bin/env bash
-
-. /common.sh
-
-replace_files
-
-rm -f /run/apache2/apache2.pid
-exec /usr/sbin/apache2ctl -D FOREGROUND

apache/vars-files

@@ -1 +0,0 @@
-apache2.conf /etc/apache2/apache2.conf

apache/vars-vars

@@ -1,22 +0,0 @@
-DHCP_DNS_MASTER
-DHCP_DNS_SERVERS
-DHCP_TFTP_SERVER
-DHCP_ROUTERS
-DHCP_UNIFI_CONTROLLER_IP
-
-DHCP_DOMAIN
-DHCP_SITE_DOMAIN
-DHCP_DYN_IPS_DOMAIN
-DHCP_REV_DOMAIN
-
-DHCP_SUBNET
-DHCP_NETMASK
-DHCP_IP_FIRST
-DHCP_IP_LAST
-DHCP_BROADCAST
-
-DNS_FORWARDER_IP_1
-DNS_FORWARDER_IP_2
-DNS_TSIG_KEY_INTERNAL_SECRET
-DNS_TSIG_KEY_EXTERNAL_SECRET
-DNS_TSIG_KEY_RNDC_SECRET

data_example/apache/files/.htaccess

@@ -1 +0,0 @@
-AddType application/x-httpd-php .ipxe

docker-compose.yml

@@ -39,9 +39,8 @@ services:
         container_name: dhcp-apache
 #        restart: unless-stopped
         volumes:
-            - ./data/apache/files:/var/www
+            - ./data/apache/files:/var/www/html
         ports:
             - "127.0.0.1:34030:80"
         env_file:
             - env
-