Adds Apache2 as new Proxy Webserver option (#87)

* Adds Apache2 as new Proxy Webserver option * Adds Apache2 log support * Removes useless ProxyPassReverse option for Apache Container * Adds example for Apache * Remvoes comments from httpd config file * Adds shared folder for sharing resources between Apache and Nginx * Cleaning * Adds shared directories * Removes shared directories as it does not work * Updates README with new Apache example
Osedea · Jul 24, 2017 · f7d0ff7 · f7d0ff7
1 parent 46e8aa5
commit f7d0ff7
Show file tree

Hide file tree

Showing 18 changed files with 307 additions and 33 deletions.
diff --git a/README.md b/README.md
@@ -82,7 +82,8 @@ services:
 ## Examples
 We provide examples of configurations you might use for a specific stack. Each example has it's own README file with instructions.
 
-* [Simple Web](https://github.com/Osedea/nodock/tree/master/_examples/simple-web) - Node + NGINX
+* [Simple Web with Apache](https://github.com/Osedea/nodock/tree/master/_examples/apache) - Node + Apache
+* [Simple Web with Nginx](https://github.com/Osedea/nodock/tree/master/_examples/nginx) - Node + NGINX
 * [MySQL](https://github.com/Osedea/nodock/tree/master/_examples/mysql) - MySQL + Node + NGINX
 * [Mongo](https://github.com/Osedea/nodock/tree/master/_examples/mongo) - MongoDB + Node + NGINX
 * [RabbitMQ](https://github.com/Osedea/nodock/tree/master/_examples/rabbitmq) - RabbitMQ + Node + NGINX

diff --git a/_examples/apache/README.md b/_examples/apache/README.md
@@ -0,0 +1,21 @@
+## Simple Web Service
+
+### Setup
+
+Copy the index file in this folder to the project root:
+
+```bash
+cd <project_folder>/
+
+cp -r nodock/_examples/apache/* .
+```
+
+### Usage
+
+```bash
+cd nodock/
+
+docker-compose up -d node apache
+```
+
+By going to `127.0.0.1` in your browser you should be seeing a nice greeting!
diff --git a/_examples/simple-web/index.js → _examples/apache/index.js b/_examples/simple-web/index.js → _examples/apache/index.js
diff --git a/_examples/simple-web/package.json → _examples/apache/package.json b/_examples/simple-web/package.json → _examples/apache/package.json
diff --git a/_examples/simple-web/README.md → _examples/nginx/README.md b/_examples/simple-web/README.md → _examples/nginx/README.md
@@ -7,7 +7,7 @@ Copy the index file in this folder to the project root:
 ```bash
 cd <project_folder>/
 
-cp -r nodock/_examples/simple-web/* .
+cp -r nodock/_examples/nginx/* .
 ```
 
 ### Usage

diff --git a/_examples/nginx/index.js b/_examples/nginx/index.js
@@ -0,0 +1,8 @@
+var express = require('express');
+var app = express();
+
+app.get('/', function(req, res) {
+    res.send('You are amazing');
+});
+
+app.listen(8000);
diff --git a/_examples/nginx/package.json b/_examples/nginx/package.json
@@ -0,0 +1,14 @@
+{
+  "name": "example-simple-web-node-docker",
+  "version": "1.0.0",
+  "description": "",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "author": "",
+  "license": "MIT",
+  "dependencies": {
+    "express": "^4.14.0"
+  }
+}
diff --git a/apache/Dockerfile b/apache/Dockerfile
@@ -0,0 +1,29 @@
+FROM httpd:2.4
+
+# openssl not installed in image
+RUN apt-get update && apt-get install openssl
+
+RUN mkdir /usr/local/apache2/templates \
+	&& mkdir /usr/local/apache2/sites-available \
+	&& rm /usr/local/apache2/conf/httpd.conf \
+	&& rm /usr/local/apache2/conf/extra/*.conf
+ADD httpd.conf /usr/local/apache2/conf
+
+COPY scripts /root/scripts/
+COPY certs/* /etc/ssl/
+
+COPY sites /usr/local/apache2/templates
+
+ARG WEB_REVERSE_PROXY_PORT=8000
+ARG WEB_SSL=false
+ARG SELF_SIGNED=false
+ARG NO_DEFAULT=false
+
+ENV WEB_REVERSE_PROXY_PORT=$WEB_REVERSE_PROXY_PORT
+ENV WEB_SSL=$WEB_SSL
+ENV SELF_SIGNED=$SELF_SIGNED
+ENV NO_DEFAULT=$NO_DEFAULT
+
+RUN /bin/bash /root/scripts/build-apache.sh
+
+CMD ["apachectl", "-D", "FOREGROUND"]
diff --git a/apache/httpd.conf b/apache/httpd.conf
@@ -0,0 +1,100 @@
+ServerRoot "/usr/local/apache2"
+
+LoadModule authn_file_module modules/mod_authn_file.so
+LoadModule authn_core_module modules/mod_authn_core.so
+LoadModule authz_host_module modules/mod_authz_host.so
+LoadModule authz_groupfile_module modules/mod_authz_groupfile.so
+LoadModule authz_user_module modules/mod_authz_user.so
+LoadModule authz_core_module modules/mod_authz_core.so
+LoadModule access_compat_module modules/mod_access_compat.so
+LoadModule auth_basic_module modules/mod_auth_basic.so
+LoadModule reqtimeout_module modules/mod_reqtimeout.so
+LoadModule filter_module modules/mod_filter.so
+LoadModule mime_module modules/mod_mime.so
+LoadModule log_config_module modules/mod_log_config.so
+LoadModule env_module modules/mod_env.so
+LoadModule headers_module modules/mod_headers.so
+LoadModule setenvif_module modules/mod_setenvif.so
+LoadModule version_module modules/mod_version.so
+LoadModule proxy_module modules/mod_proxy.so
+LoadModule proxy_http_module modules/mod_proxy_http.so
+LoadModule ssl_module modules/mod_ssl.so
+LoadModule unixd_module modules/mod_unixd.so
+LoadModule status_module modules/mod_status.so
+LoadModule autoindex_module modules/mod_autoindex.so
+LoadModule dir_module modules/mod_dir.so
+LoadModule alias_module modules/mod_alias.so
+
+<IfModule unixd_module>
+User www-data
+Group www-data
+
+</IfModule>
+
+ServerAdmin [email protected]
+
+<Directory />
+    AllowOverride none
+    Require all denied
+</Directory>
+
+DocumentRoot "/usr/local/apache2/htdocs"
+<Directory "/usr/local/apache2/htdocs">
+    Options Indexes FollowSymLinks
+    AllowOverride None
+    Require all granted
+</Directory>
+
+<IfModule dir_module>
+    DirectoryIndex index.html
+</IfModule>
+
+<Files ".ht*">
+    Require all denied
+</Files>
+
+ErrorLog /proc/self/fd/2
+LogLevel warn
+
+<IfModule log_config_module>
+    LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined
+    LogFormat "%h %l %u %t \"%r\" %>s %b" common
+
+    <IfModule logio_module>
+      LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %I %O" combinedio
+    </IfModule>
+
+    CustomLog /proc/self/fd/1 common
+
+</IfModule>
+
+<IfModule alias_module>
+    ScriptAlias /cgi-bin/ "/usr/local/apache2/cgi-bin/"
+</IfModule>
+
+<Directory "/usr/local/apache2/cgi-bin">
+    AllowOverride None
+    Options None
+    Require all granted
+</Directory>
+
+<IfModule headers_module>
+    RequestHeader unset Proxy early
+</IfModule>
+
+<IfModule mime_module>
+    TypesConfig conf/mime.types
+    AddType application/x-compress .Z
+    AddType application/x-gzip .gz .tgz
+</IfModule>
+
+Include sites-available/*.conf
+
+<IfModule proxy_html_module>
+    Include conf/extra/proxy-html.conf
+</IfModule>
+
+<IfModule ssl_module>
+    SSLRandomSeed startup builtin
+    SSLRandomSeed connect builtin
+</IfModule>
diff --git a/apache/scripts/build-apache.sh b/apache/scripts/build-apache.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+for conf in /usr/local/apache2/templates/*.conf; do
+    mv $conf "/usr/local/apache2/sites-available/"$(basename $conf) > /dev/null
+done
+
+for template in /usr/local/apache2/templates/*.template; do
+    mv $template "/usr/local/apache2/sites-available/"$(basename $template)".conf" > /dev/null
+done
+
+if [[ "$NO_DEFAULT" = true ]]; then
+    rm /usr/local/apache2/sites-available/node.template.conf
+    rm /usr/local/apache2/sites-available/node-https.template.conf
+else
+    if [[ "$WEB_SSL" = false ]]; then
+        rm /usr/local/apache2/sites-available/node-https.template.conf
+    fi
+fi
+
+. /root/scripts/run-openssl.sh
diff --git a/apache/scripts/run-openssl.sh b/apache/scripts/run-openssl.sh
@@ -0,0 +1,31 @@
+#!/bin/bash
+
+if [[ "$WEB_SSL" = true && "$NO_DEFAULT" = false ]]; then
+    if [[ "$SELF_SIGNED" = true ]]; then
+        echo "---------------------------------------------------------"
+        echo "APACHE: Generating certificates"
+        echo "---------------------------------------------------------"
+        openssl req \
+            -new \
+            -newkey rsa:4096 \
+            -days 1095 \
+            -nodes \
+            -x509 \
+            -subj "/C=FK/ST=Fake/L=Fake/O=Fake/CN=0.0.0.0" \
+            -keyout /etc/ssl/privkey1.pem \
+            -out /etc/ssl/cert1.pem
+        chown www-data:www-data /etc/ssl/cert1.pem
+        chown www-data:www-data /etc/ssl/privkey1.pem
+    else
+        echo "---------------------------------------------------------"
+        echo "APACHE: Using certificates in 'nodock/apache/certs/'"
+        echo "---------------------------------------------------------"
+        if [ -e /var/certs/cert1.pem ]; then
+            cp /var/certs/cert1.pem /etc/ssl/cert1.pem
+        fi
+        if [ -e /var/certs/privkey1.pem ]; then
+            cp /var/certs/privkey1.pem /etc/ssl/privkey1.pem
+        fi
+    fi
+fi
+
diff --git a/apache/sites/node-https.template b/apache/sites/node-https.template
@@ -0,0 +1,17 @@
+# environment variables
+# WEB_REVERSE_PROXY_PORT ${WEB_REVERSE_PROXY_PORT}
+
+Listen 443
+
+<VirtualHost *:443>
+
+	SSLEngine on
+	SSLCertificateFile /etc/ssl/cert1.pem
+	SSLCertificateKeyFile /etc/ssl/privkey1.pem
+
+	ProxyPass / http://node:${WEB_REVERSE_PROXY_PORT}
+
+	ErrorLog logs/https-error.log
+	CustomLog logs/https-access.log common
+
+</VirtualHost>
diff --git a/apache/sites/node.template b/apache/sites/node.template
@@ -0,0 +1,14 @@
+# environment variables
+# WEB_REVERSE_PROXY_PORT ${WEB_REVERSE_PROXY_PORT}
+
+Listen 80
+
+<VirtualHost *:80>
+
+	ProxyPass / http://node:${WEB_REVERSE_PROXY_PORT}
+	# ProxyPassReverse / http://node:${WEB_REVERSE_PROXY_PORT}
+
+	ErrorLog logs/http-error.log
+	CustomLog logs/http-access.log common
+
+</VirtualHost>
diff --git a/composehub.yml b/composehub.yml
@@ -5,6 +5,6 @@ description: |
   Framework Agnostic: MEAN, Meteor, Sails, etc. Run the stack you choose, the way you want. Totally unopinionated, fully customizable. Better, Faster & Stronger: Docker + Docker Compose ensures your environment is fast and stable for development, testing and production. Focus on Code: Plug-and-play configurations allow you to get started in minutes. Reduce the learning curve for new developers.
 email: [email protected]
 repo_url: https://github.com/Osedea/nodock
-tags: node,docker,nginx,mysql,certbot,yarn,mongodb,memcached,rabbitmq
+tags: node,docker,nginx,apache,mysql,certbot,yarn,mongodb,memcached,rabbitmq
 private: false
 cmd: 
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -50,10 +50,26 @@ services:
             - "443:443"
         tty: true
 
+    apache:
+        build:
+            context: ./apache
+            args:
+                - WEB_REVERSE_PROXY_PORT=8000
+                - WEB_SSL=false
+                - SELF_SIGNED=false
+                - NO_DEFAULT=false
+        volumes_from:
+            - volumes
+        ports:
+            - "80:80"
+            - "443:443"
+        tty: true
+
     certbot:
         build:
             context: ./certbot
         links:
+            - apache
             - nginx
         volumes_from:
             - volumes
@@ -109,3 +125,4 @@ services:
             - ./data/mysql:/var/lib/mysql
             - ./data/mongo:/var/lib/mongodb
             - ./data/logs/nginx/:/var/log/nginx
+            - ./data/logs/apache/:/usr/local/apache2/logs
diff --git a/nginx/certs/.gitignore b/nginx/certs/.gitignore
diff --git a/nginx/scripts/build-nginx.sh b/nginx/scripts/build-nginx.sh
@@ -17,31 +17,4 @@ else
     fi
 fi
 
-if [[ "$WEB_SSL" = true && "$NO_DEFAULT" = false ]]; then
-    if [[ "$SELF_SIGNED" = true ]]; then
-        echo "---------------------------------------------------------"
-        echo "NGINX: Generating certificates"
-        echo "---------------------------------------------------------"
-        openssl req \
-            -new \
-            -newkey rsa:4096 \
-            -days 1095 \
-            -nodes \
-            -x509 \
-            -subj "/C=FK/ST=Fake/L=Fake/O=Fake/CN=0.0.0.0" \
-            -keyout /etc/ssl/privkey1.pem \
-            -out /etc/ssl/cert1.pem
-        chown www-data:www-data /etc/ssl/cert1.pem
-        chown www-data:www-data /etc/ssl/privkey1.pem
-    else
-        echo "---------------------------------------------------------"
-        echo "NGINX: Using certificates in 'nodock/nginx/certs/'"
-        echo "---------------------------------------------------------"
-        if [ -e /var/certs/cert1.pem ]; then
-            cp /var/certs/cert1.pem /etc/ssl/cert1.pem
-        fi
-        if [ -e /var/certs/privkey1.pem ]; then
-            cp /var/certs/privkey1.pem /etc/ssl/privkey1.pem
-        fi
-    fi
-fi
+. /root/scripts/run-openssl.sh
diff --git a/nginx/scripts/run-openssl.sh b/nginx/scripts/run-openssl.sh
@@ -0,0 +1,31 @@
+#!/bin/bash
+
+if [[ "$WEB_SSL" = true && "$NO_DEFAULT" = false ]]; then
+    if [[ "$SELF_SIGNED" = true ]]; then
+        echo "---------------------------------------------------------"
+        echo "APACHE: Generating certificates"
+        echo "---------------------------------------------------------"
+        openssl req \
+            -new \
+            -newkey rsa:4096 \
+            -days 1095 \
+            -nodes \
+            -x509 \
+            -subj "/C=FK/ST=Fake/L=Fake/O=Fake/CN=0.0.0.0" \
+            -keyout /etc/ssl/privkey1.pem \
+            -out /etc/ssl/cert1.pem
+        chown www-data:www-data /etc/ssl/cert1.pem
+        chown www-data:www-data /etc/ssl/privkey1.pem
+    else
+        echo "---------------------------------------------------------"
+        echo "APACHE: Using certificates in 'nodock/apache/certs/'"
+        echo "---------------------------------------------------------"
+        if [ -e /var/certs/cert1.pem ]; then
+            cp /var/certs/cert1.pem /etc/ssl/cert1.pem
+        fi
+        if [ -e /var/certs/privkey1.pem ]; then
+            cp /var/certs/privkey1.pem /etc/ssl/privkey1.pem
+        fi
+    fi
+fi
+