From 1562cca09f775991853b36d0495d46b39870bff0 Mon Sep 17 00:00:00 2001
From: Paris Kasidiaris <pariskasidiaris@gmail.com>
Date: Tue, 8 Jan 2019 16:00:10 +0200
Subject: [PATCH 01/17] Housekeeping

1. Extract HTTPS handling in nginx.conf into its own `.lua` file
2. Configure log level according to `CERYX_DEBUG`
3. Introduce several debugging logs
---
 ceryx/Dockerfile                 |  5 ++
 ceryx/bin/entrypoint.sh          |  9 ++++
 ceryx/nginx/conf/nginx.conf.tmpl | 78 ++------------------------------
 ceryx/nginx/lualib/https.lua     | 72 +++++++++++++++++++++++++++++
 ceryx/nginx/lualib/router.lua    | 42 ++++++++++-------
 5 files changed, 115 insertions(+), 91 deletions(-)
 create mode 100644 ceryx/nginx/lualib/https.lua

diff --git a/ceryx/Dockerfile b/ceryx/Dockerfile
index b8e925f..a55338c 100644
--- a/ceryx/Dockerfile
+++ b/ceryx/Dockerfile
@@ -1,5 +1,8 @@
 FROM openresty/openresty:1.13.6.1-xenial
 
+ARG user=www-data
+ARG group=www-data
+
 RUN mkdir -p /etc/letsencrypt &&\
     openssl req -new -newkey rsa:2048 -days 3650 -nodes -x509 \
         -subj '/CN=sni-support-required-for-valid-ssl' \
@@ -15,6 +18,8 @@ RUN curl -fSslL https://github.com/jwilder/dockerize/releases/download/${DOCKERI
 # Install lua-resty-auto-ssl for dynamically generating certificates from LE
 # https://github.com/GUI/lua-resty-auto-ssl
 RUN /usr/local/openresty/luajit/bin/luarocks install lua-resty-auto-ssl 0.12.0
+RUN mkdir /etc/resty-auto-ssl/
+RUN chown -R $user:$group /etc/resty-auto-ssl/
 
 # Add the entrypoint script
 COPY ./bin/entrypoint.sh /entrypoint.sh
diff --git a/ceryx/bin/entrypoint.sh b/ceryx/bin/entrypoint.sh
index 4d745a5..e2a955c 100755
--- a/ceryx/bin/entrypoint.sh
+++ b/ceryx/bin/entrypoint.sh
@@ -1,5 +1,14 @@
 #! /bin/bash
 
+set -ex
+
+if [ $CERYX_DEBUG == "true" ]
+  then
+    export CERYX_LOG_LEVEL=debug
+  else
+    export CERYX_LOG_LEVEL=info
+fi
+
 # Use Dockerize for templates and to wait for Redis
 /usr/local/bin/dockerize \
     ${CERYX_DOCKERIZE_EXTRA_ARGS} \
diff --git a/ceryx/nginx/conf/nginx.conf.tmpl b/ceryx/nginx/conf/nginx.conf.tmpl
index 7de17fb..a5b184b 100644
--- a/ceryx/nginx/conf/nginx.conf.tmpl
+++ b/ceryx/nginx/conf/nginx.conf.tmpl
@@ -23,7 +23,7 @@ http {
 
     # Logging
     access_log /dev/stdout;
-    error_log /dev/stderr warn;
+    error_log /dev/stderr {{ default .Env.CERYX_LOG_LEVEL "info" }};
 
     # Lua settings
     lua_package_path "$prefix/lualib/?.lua;;";
@@ -36,81 +36,9 @@ http {
     {{ else }}
     lua_code_cache on;
     {{ end }}
-    # see https://github.com/openresty/lua-resty-core
-    init_by_lua_block  {
-        auto_ssl = (require "resty.auto-ssl").new()
-
-        -- Define a function to determine which SNI domains to automatically handle
-        -- and register new certificates for. Defaults to not allowing any domains,
-        -- so this must be configured.
-        auto_ssl:set("allow_domain", function(domain)
-            local host = domain
-
-            -- Check if key exists in local cache
-            local cache = ngx.shared.ceryx
-            local res, flags = cache:get(host)
-            if res then
-                return true
-            end
-
-            local redis = require "resty.redis"
-            local red = redis:new()
-            red:set_timeout(100) -- 100 ms
-            local redis_host = os.getenv("CERYX_REDIS_HOST")
-            if not redis_host then redis_host = "127.0.0.1" end
-            local redis_port = os.getenv("CERYX_REDIS_PORT")
-            if not redis_port then redis_port = 6379 end
-            local redis_password = os.getenv("CERYX_REDIS_PASSWORD")
-            if not redis_password then redis_password = nil end
-
-            local res, err = red:connect(redis_host, redis_port)
-
-            -- Return if could not connect to Redis
-            if not res then
-                ngx.log(ngx.ERR, "Error connecting to redis: " .. (err or ""))
-                return false
-            end
-
-            -- Authenticate with Redis if necessary
-            if redis_password then
-                local res, err = red:auth(redis_password)
-                if not res then
-                    ngx.log(ngx.ERR, "Failed to authenticate with redis: ", err)
-                    return false
-                end
-            end
 
-            -- Construct Redis key
-            local prefix = os.getenv("CERYX_REDIS_PREFIX")
-            if not prefix then prefix = "ceryx" end
-            local key = prefix .. ":routes:" .. host
-
-            -- Try to get target for host
-            res, err = red:get(key)
-            if not res or res == ngx.null then
-                return false
-            end
-
-            -- Save found key to local cache for 5 seconds
-            cache:set(host, res, 5)
-
-            return true
-        end)
-
-        -- Set the resty-auto-ssl storage to Redis, using the CERYX_* env variables
-        local redis_host = os.getenv("CERYX_REDIS_HOST")
-        if not redis_host then redis_host = "127.0.0.1" end
-        local redis_port = os.getenv("CERYX_REDIS_PORT")
-        if not redis_port then redis_port = 6379 end
-        auto_ssl:set("storage_adapter", "resty.auto-ssl.storage_adapters.redis")
-        auto_ssl:set("redis", {
-            host = redis_host,
-            port = redis_port
-        })
-
-        auto_ssl:init()
-        require "resty.core"
-    }
+    # see https://github.com/openresty/lua-resty-core
+    init_by_lua_file "lualib/https.lua";
 
     init_worker_by_lua_block {
         auto_ssl:init_worker()
diff --git a/ceryx/nginx/lualib/https.lua b/ceryx/nginx/lualib/https.lua
new file mode 100644
index 0000000..953117e
--- /dev/null
+++ b/ceryx/nginx/lualib/https.lua
@@ -0,0 +1,72 @@
+auto_ssl = (require "resty.auto-ssl").new()
+
+-- Define a function to determine which SNI domains to automatically handle
+-- and register new certificates for. Defaults to not allowing any domains,
+-- so this must be configured.
+auto_ssl:set("allow_domain", function(domain)
+    local host = domain
+
+    -- Check if key exists in local cache
+    local cache = ngx.shared.ceryx
+    local res, flags = cache:get(host)
+    if res then
+        return true
+    end
+
+    local redis = require "resty.redis"
+    local red = redis:new()
+    red:set_timeout(100) -- 100 ms
+    local redis_host = os.getenv("CERYX_REDIS_HOST")
+    if not redis_host then redis_host = "127.0.0.1" end
+    local redis_port = os.getenv("CERYX_REDIS_PORT")
+    if not redis_port then redis_port = 6379 end
+    local redis_password = os.getenv("CERYX_REDIS_PASSWORD")
+    if not redis_password then redis_password = nil end
+
+    local res, err = red:connect(redis_host, redis_port)
+
+    -- Return if could not connect to Redis
+    if not res then
+        ngx.log(ngx.ERR, "Error connecting to redis: " .. (err or ""))
+        return false
+    end
+
+    -- Authenticate with Redis if necessary
+    if redis_password then
+        local res, err = red:auth(redis_password)
+        if not res then
+            ngx.log(ngx.ERR, "Failed to authenticate with redis: ", err)
+            return false
+        end
+    end
+
+    -- Construct Redis key
+    local prefix = os.getenv("CERYX_REDIS_PREFIX")
+    if not prefix then prefix = "ceryx" end
+    local key = prefix .. ":routes:" .. host
+
+    -- Try to get target for host
+    res, err = red:get(key)
+    if not res or res == ngx.null then
+        return false
+    end
+
+    -- Save found key to local cache for 5 seconds
+    cache:set(host, res, 5)
+
+    return true
+end)
+
+-- Set the resty-auto-ssl storage to Redis, using the CERYX_* env variables
+local redis_host = os.getenv("CERYX_REDIS_HOST")
+if not redis_host then redis_host = "127.0.0.1" end
+local redis_port = os.getenv("CERYX_REDIS_PORT")
+if not redis_port then redis_port = 6379 end
+auto_ssl:set("storage_adapter", "resty.auto-ssl.storage_adapters.redis")
+auto_ssl:set("redis", {
+    host = redis_host,
+    port = redis_port
+})
+
+auto_ssl:init()
+require "resty.core"
\ No newline at end of file
diff --git a/ceryx/nginx/lualib/router.lua b/ceryx/nginx/lualib/router.lua
index b0dd172..419d89c 100644
--- a/ceryx/nginx/lualib/router.lua
+++ b/ceryx/nginx/lualib/router.lua
@@ -2,6 +2,11 @@ local host = ngx.var.host
 local is_not_https = (ngx.var.scheme ~= "https")
 local cache = ngx.shared.ceryx
 
+function route(source, target)
+    ngx.var.container_url = target
+    ngx.log(ngx.INFO, "Routing request for " .. source .. " to " .. target .. ".")
+end
+
 local prefix = os.getenv("CERYX_REDIS_PREFIX")
 if not prefix then prefix = "ceryx" end
 
@@ -48,27 +53,32 @@ end
 -- Check if key exists in local cache
 res, flags = cache:get(host)
 if res then
-    ngx.var.container_url = res
-    return
-end
+    ngx.log(ngx.DEBUG, "Cache hit for " .. host .. ".")
+    route(host, res)
+else
+    ngx.log(ngx.DEBUG, "Cache miss for " .. host .. ".")
 
--- Construct Redis key
-local key = prefix .. ":routes:" .. host
-
--- Try to get target for host
-res, err = red:get(key)
-if not res or res == ngx.null then
-    -- Construct Redis key for $wildcard
-    key = prefix .. ":routes:$wildcard"
+    -- Construct Redis key
+    local key = prefix .. ":routes:" .. host
+    
+    -- Try to get target for host
     res, err = red:get(key)
     if not res or res == ngx.null then
-        return ngx.exit(ngx.HTTP_BAD_GATEWAY)
+        ngx.log(ngx.INFO, "Could not find target for " .. host .. ".")
+
+        -- Construct Redis key for $wildcard
+        key = prefix .. ":routes:$wildcard"
+        res, err = red:get(key)
+        if not res or res == ngx.null then
+            ngx.log(ngx.INFO, "No $wildcard target configured for fallback. Exiting with Bad Gateway.")
+            return ngx.exit(ngx.HTTP_BAD_GATEWAY)
+        else
+            ngx.log(ngx.DEBUG, "Falling back to " .. res .. ".")
+        end
     end
-    ngx.var.container_url = res
-    return
 end
 
 -- Save found key to local cache for 5 seconds
+route(host, res)
 cache:set(host, res, 5)
-
-ngx.var.container_url = res
+ngx.log(ngx.DEBUG, "Saving route from " .. host .. " to " .. res .. " in local cache for 5 seconds.")

From 90f40e6fcc9193c69f24669582f237be8eba4ac7 Mon Sep 17 00:00:00 2001
From: Paris Kasidiaris <pariskasidiaris@gmail.com>
Date: Tue, 8 Jan 2019 16:23:12 +0200
Subject: [PATCH 02/17] Update README

---
 README.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/README.md b/README.md
index 19388a5..41208e3 100644
--- a/README.md
+++ b/README.md
@@ -32,6 +32,10 @@ Ceryx is configured with the following environment variables:
   - `CERYX_SSL_CERT_KEY`: The path to the fallback SSL certificate key (default: randomly generated)
   - `CERYX_SSL_CERT`: The path to the fallback SSL certificate (default: randomly generated)
 
+## Adjusting log level
+
+Ceryx will output logs of level to equal or higher of `info` by default. Setting `CERYX_DEBUG` to `true` will also output logs of `debug` level.
+
 ### Not running Ceryx as container?
 
 👋 **Heads up!** Ceryx is designed to be run inside a container using Docker or similar tools. 

From f88a0089898680f0ce53802e2acfff8a1494601e Mon Sep 17 00:00:00 2001
From: Paris Kasidiaris <pariskasidiaris@gmail.com>
Date: Tue, 8 Jan 2019 17:14:13 +0200
Subject: [PATCH 03/17] Remove `/usr/local/openresty/nginx/conf` so it includes
 only Ceryx' config.

---
 ceryx/Dockerfile | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/ceryx/Dockerfile b/ceryx/Dockerfile
index a55338c..ea5800d 100644
--- a/ceryx/Dockerfile
+++ b/ceryx/Dockerfile
@@ -21,11 +21,13 @@ RUN /usr/local/openresty/luajit/bin/luarocks install lua-resty-auto-ssl 0.12.0
 RUN mkdir /etc/resty-auto-ssl/
 RUN chown -R $user:$group /etc/resty-auto-ssl/
 
-# Add the entrypoint script
-COPY ./bin/entrypoint.sh /entrypoint.sh
-ENTRYPOINT [ "/entrypoint.sh" ]
+RUN rm -f /usr/local/openresty/nginx/conf
 
 COPY ./nginx/conf /usr/local/openresty/nginx/conf
 COPY ./nginx/lualib /usr/local/openresty/nginx/lualib
 
+# Add the entrypoint script
+COPY ./bin/entrypoint.sh /entrypoint.sh
+ENTRYPOINT [ "/entrypoint.sh" ]
+
 CMD ["/usr/local/openresty/bin/openresty", "-g", "daemon off;"]

From 5bd4d024700bad2a3238996a8b25da718a2159df Mon Sep 17 00:00:00 2001
From: Paris Kasidiaris <pariskasidiaris@gmail.com>
Date: Tue, 8 Jan 2019 17:26:36 +0200
Subject: [PATCH 04/17] Remove directory contents. Not the directory itself.

---
 ceryx/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ceryx/Dockerfile b/ceryx/Dockerfile
index ea5800d..30e9ca0 100644
--- a/ceryx/Dockerfile
+++ b/ceryx/Dockerfile
@@ -21,7 +21,7 @@ RUN /usr/local/openresty/luajit/bin/luarocks install lua-resty-auto-ssl 0.12.0
 RUN mkdir /etc/resty-auto-ssl/
 RUN chown -R $user:$group /etc/resty-auto-ssl/
 
-RUN rm -f /usr/local/openresty/nginx/conf
+RUN rm -f /usr/local/openresty/nginx/conf/*
 
 COPY ./nginx/conf /usr/local/openresty/nginx/conf
 COPY ./nginx/lualib /usr/local/openresty/nginx/lualib

From f56d528096cf792a059dd7553990a6c4b008fcce Mon Sep 17 00:00:00 2001
From: Paris Kasidiaris <pariskasidiaris@gmail.com>
Date: Tue, 8 Jan 2019 18:05:24 +0200
Subject: [PATCH 05/17] Do not run any "resty-auto-ssl" code if
 `CERYX_DISABLE_LETS_ENCRYPT` is `true`.

---
 ceryx/nginx/conf/ceryx.conf.tmpl | 10 ++++++++--
 ceryx/nginx/conf/nginx.conf.tmpl |  6 +++++-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/ceryx/nginx/conf/ceryx.conf.tmpl b/ceryx/nginx/conf/ceryx.conf.tmpl
index 94d19d2..aa9a87f 100644
--- a/ceryx/nginx/conf/ceryx.conf.tmpl
+++ b/ceryx/nginx/conf/ceryx.conf.tmpl
@@ -17,8 +17,10 @@ server {
     ssl_certificate {{ default .Env.CERYX_SSL_CERT "/etc/ssl/resty-auto-ssl-fallback.crt" }};
     ssl_certificate_key {{ default .Env.CERYX_SSL_CERT_KEY "/etc/ssl/resty-auto-ssl-fallback.key" }};
 
-    # Disable the LE certificate generation
     {{ if ne (lower (default .Env.CERYX_DISABLE_LETS_ENCRYPT "")) "true" }}
+    # Generate Let's Encrypt certificates automatically, if
+    # `CERYX_DISABLE_LETS_ENCRYPT` is *not* set to `true`.
+
     ssl_certificate_by_lua_block {
         auto_ssl:ssl_certificate()
     }
@@ -73,7 +75,10 @@ server {
     }
 }
 
-# Internal server running on port 8999 for handling certificate tasks.
+{{ if ne (lower (default .Env.CERYX_DISABLE_LETS_ENCRYPT "")) "true" }}
+# Launch the Let's Encrypt certificate internal server running on port 8999, if
+# `CERYX_DISABLE_LETS_ENCRYPT` is *not* set to `true`.
+
 server {
     listen 127.0.0.1:8999;
     client_body_buffer_size 1m;
@@ -84,3 +89,4 @@ server {
         }
     }
 }
+{{ end }}
diff --git a/ceryx/nginx/conf/nginx.conf.tmpl b/ceryx/nginx/conf/nginx.conf.tmpl
index a5b184b..b846980 100644
--- a/ceryx/nginx/conf/nginx.conf.tmpl
+++ b/ceryx/nginx/conf/nginx.conf.tmpl
@@ -37,12 +37,16 @@ http {
     lua_code_cache on;
     {{ end }}
 
-    # see https://github.com/openresty/lua-resty-core
+    {{ if ne (lower (default .Env.CERYX_DISABLE_LETS_ENCRYPT "")) "true" }}
+    # Enable automatic Let's Encryps certificate generation, if
+    # `CERYX_DISABLE_LETS_ENCRYPT` is *not* set to `true`.
+    # Check out https://github.com/openresty/lua-resty-core
     init_by_lua_file "lualib/https.lua";
 
     init_worker_by_lua_block {
         auto_ssl:init_worker()
     }
+    {{ end }}
 
     # Includes
     include mime.types;

From a67b1ce0e624efaa611b1a77e35c561394c4b2d8 Mon Sep 17 00:00:00 2001
From: Paris Kasidiaris <pariskasidiaris@gmail.com>
Date: Tue, 8 Jan 2019 19:02:18 +0200
Subject: [PATCH 06/17] Make Ceryx 503 fallback a static HTML page to avoid
 messing with network.

---
 ceryx/Dockerfile                 |  1 +
 ceryx/README.md                  |  1 -
 ceryx/nginx/conf/ceryx.conf.tmpl | 20 +++-------------
 ceryx/nginx/conf/nginx.conf.tmpl |  1 -
 ceryx/nginx/lualib/router.lua    |  4 ++--
 ceryx/static/503.html            | 41 ++++++++++++++++++++++++++++++++
 docker-compose.override.yml      |  1 +
 7 files changed, 48 insertions(+), 21 deletions(-)
 create mode 100644 ceryx/static/503.html

diff --git a/ceryx/Dockerfile b/ceryx/Dockerfile
index 30e9ca0..5b5c9b9 100644
--- a/ceryx/Dockerfile
+++ b/ceryx/Dockerfile
@@ -25,6 +25,7 @@ RUN rm -f /usr/local/openresty/nginx/conf/*
 
 COPY ./nginx/conf /usr/local/openresty/nginx/conf
 COPY ./nginx/lualib /usr/local/openresty/nginx/lualib
+COPY ./static /etc/ceryx/static
 
 # Add the entrypoint script
 COPY ./bin/entrypoint.sh /entrypoint.sh
diff --git a/ceryx/README.md b/ceryx/README.md
index 156305e..ab855d8 100644
--- a/ceryx/README.md
+++ b/ceryx/README.md
@@ -18,7 +18,6 @@ services:
     environment:
       - CERYX_REDIS_HOST=redis
       - CERYX_REDIS_PORT=6379
-      - CERYX_FALLBACK=www.something.com
     restart: always
 
     ...
diff --git a/ceryx/nginx/conf/ceryx.conf.tmpl b/ceryx/nginx/conf/ceryx.conf.tmpl
index aa9a87f..7f2edc0 100644
--- a/ceryx/nginx/conf/ceryx.conf.tmpl
+++ b/ceryx/nginx/conf/ceryx.conf.tmpl
@@ -55,23 +55,9 @@ server {
         proxy_pass http://$container_url$request_uri;
     }
 
-    error_page 502 @bad_gateway;
-    location @bad_gateway {
-        set $fallback_url "";
-
-        # Get fallback URL from environment
-        access_by_lua_block {
-            ngx.var.fallback_url = os.getenv("CERYX_FALLBACK")
-            if not ngx.var.fallback_url then ngx.var.fallback_url = "www.something.com" end
-        }
-
-        # Proxy configuration
-        proxy_set_header Host $http_host;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header X-Real-IP  $remote_addr;
-        proxy_set_header X-Forwarded-Proto $proxy_set_x_forwarded_proto;
-
-        proxy_pass http://$fallback_url$request_uri;
+    error_page 503 /503.html;
+    location = /503.html {
+        root /etc/ceryx/static;
     }
 }
 
diff --git a/ceryx/nginx/conf/nginx.conf.tmpl b/ceryx/nginx/conf/nginx.conf.tmpl
index b846980..a8b6346 100644
--- a/ceryx/nginx/conf/nginx.conf.tmpl
+++ b/ceryx/nginx/conf/nginx.conf.tmpl
@@ -6,7 +6,6 @@ env CERYX_REDIS_PREFIX;
 env CERYX_REDIS_HOST;
 env CERYX_REDIS_PASSWORD;
 env CERYX_REDIS_PORT;
-env CERYX_FALLBACK;
 
 events {
     worker_connections 1024;
diff --git a/ceryx/nginx/lualib/router.lua b/ceryx/nginx/lualib/router.lua
index 419d89c..e949381 100644
--- a/ceryx/nginx/lualib/router.lua
+++ b/ceryx/nginx/lualib/router.lua
@@ -24,7 +24,7 @@ local res, err = red:connect(redis_host, redis_port)
 
 -- Return if could not connect to Redis
 if not res then
-    return ngx.exit(ngx.HTTP_BAD_GATEWAY)
+    return ngx.exit(ngx.HTTP_SERVER_ERROR)
 end
 
 if redis_password then
@@ -71,7 +71,7 @@ else
         res, err = red:get(key)
         if not res or res == ngx.null then
             ngx.log(ngx.INFO, "No $wildcard target configured for fallback. Exiting with Bad Gateway.")
-            return ngx.exit(ngx.HTTP_BAD_GATEWAY)
+            return ngx.exit(ngx.HTTP_SERVICE_UNAVAILABLE)
         else
             ngx.log(ngx.DEBUG, "Falling back to " .. res .. ".")
         end
diff --git a/ceryx/static/503.html b/ceryx/static/503.html
new file mode 100644
index 0000000..4fa7b7c
--- /dev/null
+++ b/ceryx/static/503.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>There is nothing here.</title>
+
+    <link href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:400,700" rel="stylesheet">
+    <style>
+        body {
+            font-family: 'Source Sans Pro', sans-serif;
+            background: #f5f5f5;
+            display: flex;
+            justify-content: center;
+        }
+
+        main {
+            display: inline-block;
+            text-align: center;
+            background: #fff;
+            padding: 32px;
+            border-radius: 4px;
+            box-shadow: 0 2px 2px 0 rgba(0,0,0,0.14),
+                        0 1px 5px 0 rgba(0,0,0,0.12),
+                        0 3px 1px -2px rgba(0,0,0,0.2) !important;
+            margin-top: 64px;
+        }
+
+        h1 {
+            padding: 0;
+            margin: 0;
+        }
+    </style>
+</head>
+<body>
+    <main>
+        <h1>Ceryx</h1>
+        <h2>Service Not Available</h2>
+        <p>The website you are trying to access, does not exist.</p>
+    </main>
+</body>
+</html> 
\ No newline at end of file
diff --git a/docker-compose.override.yml b/docker-compose.override.yml
index 4d58b47..ab15a66 100644
--- a/docker-compose.override.yml
+++ b/docker-compose.override.yml
@@ -6,6 +6,7 @@ services:
     volumes:
       - ./ceryx/nginx/conf:/usr/local/openresty/nginx/conf
       - ./ceryx/nginx/lualib:/usr/local/openresty/nginx/lualib
+      - ./ceryx/static:/etc/ceryx/static
     environment:
       CERYX_DEBUG: ${CERYX_DEBUG:-true}
       CERYX_DOCKERIZE_EXTRA_ARGS: ""

From 86abc100f3e1478ef1e3e68d6c06fe176d7ee8f0 Mon Sep 17 00:00:00 2001
From: Paris Kasidiaris <pariskasidiaris@gmail.com>
Date: Tue, 8 Jan 2019 20:08:39 +0200
Subject: [PATCH 07/17] Add Server Error page and more debug logs

---
 ceryx/nginx/conf/ceryx.conf.tmpl |  5 ++++
 ceryx/nginx/lualib/router.lua    | 10 ++++++--
 ceryx/static/500.html            | 41 ++++++++++++++++++++++++++++++++
 ceryx/static/503.html            |  2 +-
 4 files changed, 55 insertions(+), 3 deletions(-)
 create mode 100644 ceryx/static/500.html

diff --git a/ceryx/nginx/conf/ceryx.conf.tmpl b/ceryx/nginx/conf/ceryx.conf.tmpl
index 7f2edc0..5a84d53 100644
--- a/ceryx/nginx/conf/ceryx.conf.tmpl
+++ b/ceryx/nginx/conf/ceryx.conf.tmpl
@@ -59,6 +59,11 @@ server {
     location = /503.html {
         root /etc/ceryx/static;
     }
+
+    error_page 500 /500.html;
+    location = /500.html {
+        root /etc/ceryx/static;
+    }
 }
 
 {{ if ne (lower (default .Env.CERYX_DISABLE_LETS_ENCRYPT "")) "true" }}
diff --git a/ceryx/nginx/lualib/router.lua b/ceryx/nginx/lualib/router.lua
index e949381..8a18634 100644
--- a/ceryx/nginx/lualib/router.lua
+++ b/ceryx/nginx/lualib/router.lua
@@ -11,6 +11,7 @@ local prefix = os.getenv("CERYX_REDIS_PREFIX")
 if not prefix then prefix = "ceryx" end
 
 -- Prepare the Redis client
+ngx.log(ngx.DEBUG, "Preparing Redis client.")
 local redis = require "resty.redis"
 local red = redis:new()
 red:set_timeout(100) -- 100 ms
@@ -24,16 +25,21 @@ local res, err = red:connect(redis_host, redis_port)
 
 -- Return if could not connect to Redis
 if not res then
+    ngx.log(ngx.DEBUG, "Could not prepare Redis client: " .. err)
     return ngx.exit(ngx.HTTP_SERVER_ERROR)
 end
 
+ngx.log(ngx.DEBUG, "Redis client prepared.")
+
 if redis_password then
+    ngx.log(ngx.DEBUG, "Authenticating with Redis.")
     local res, err = red:auth(redis_password)
     if not res then
-        ngx.ERR("Failed to authenticate Redis: ", err)
-        return
+        ngx.ERR("Could not authenticate with Redis: ", err)
+        return ngx.exit(ngx.HTTP_SERVER_ERROR)
     end
 end
+ngx.log(ngx.DEBUG, "Authenticated with Redis.")
 
 if is_not_https then
     local settings_key = prefix .. ":settings:" .. host
diff --git a/ceryx/static/500.html b/ceryx/static/500.html
new file mode 100644
index 0000000..6fa3240
--- /dev/null
+++ b/ceryx/static/500.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>Ceryx - Server Error</title>
+
+    <link href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:400,700" rel="stylesheet">
+    <style>
+        body {
+            font-family: 'Source Sans Pro', sans-serif;
+            background: #f5f5f5;
+            display: flex;
+            justify-content: center;
+        }
+
+        main {
+            display: inline-block;
+            text-align: center;
+            background: #fff;
+            padding: 32px;
+            border-radius: 4px;
+            box-shadow: 0 2px 2px 0 rgba(0,0,0,0.14),
+                        0 1px 5px 0 rgba(0,0,0,0.12),
+                        0 3px 1px -2px rgba(0,0,0,0.2) !important;
+            margin-top: 64px;
+        }
+
+        h1 {
+            padding: 0;
+            margin: 0;
+        }
+    </style>
+</head>
+<body>
+    <main>
+        <h1>Ceryx</h1>
+        <h2>Server Error</h2>
+        <p>We are sorry, an unexpected error occured while servicing your request.</p>
+    </main>
+</body>
+</html> 
\ No newline at end of file
diff --git a/ceryx/static/503.html b/ceryx/static/503.html
index 4fa7b7c..feb4356 100644
--- a/ceryx/static/503.html
+++ b/ceryx/static/503.html
@@ -2,7 +2,7 @@
 <html lang="en">
 <head>
     <meta charset="UTF-8">
-    <title>There is nothing here.</title>
+    <title>Ceryx - Service Not Available</title>
 
     <link href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:400,700" rel="stylesheet">
     <style>

From ee25ab95dc4c1ebe327edb745b6d70fae4d7d8f2 Mon Sep 17 00:00:00 2001
From: Paris Kasidiaris <paris@sourcelair.com>
Date: Sun, 20 Jan 2019 14:15:30 +0200
Subject: [PATCH 08/17] Start integrating GitHub actions for tests.

---
 .github/main.workflow   | 3 +++
 actions/test/Dockerfile | 7 +++++++
 2 files changed, 10 insertions(+)
 create mode 100644 .github/main.workflow
 create mode 100644 actions/test/Dockerfile

diff --git a/.github/main.workflow b/.github/main.workflow
new file mode 100644
index 0000000..5625241
--- /dev/null
+++ b/.github/main.workflow
@@ -0,0 +1,3 @@
+action "test" {
+  uses = "./actions/test"
+}
\ No newline at end of file
diff --git a/actions/test/Dockerfile b/actions/test/Dockerfile
new file mode 100644
index 0000000..c2bf854
--- /dev/null
+++ b/actions/test/Dockerfile
@@ -0,0 +1,7 @@
+FROM ubuntu:18.04
+
+LABEL "com.github.actions.name"="Ceryx Test"
+LABEL "com.github.actions.description"="Ensure that Ceryx routes requests as expected."
+
+LABEL "repository"="http://github.com/sourcelair/ceryx"
+LABEL "maintainer"="Paris Kasidiaris <paris@sourcelair.com>"

From 99831463eb9808378b1c7b3665be52e1e2ab0709 Mon Sep 17 00:00:00 2001
From: Paris Kasidiaris <paris@sourcelair.com>
Date: Sun, 20 Jan 2019 14:25:30 +0200
Subject: [PATCH 09/17] Fix workflow syntax

---
 .github/main.workflow | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.github/main.workflow b/.github/main.workflow
index 5625241..1ac71c8 100644
--- a/.github/main.workflow
+++ b/.github/main.workflow
@@ -1,3 +1,9 @@
+workflow "Main" {
+  on = "push"
+  resolves = ["test"]
+}
+
+
 action "test" {
   uses = "./actions/test"
 }
\ No newline at end of file

From 7ccdd5efe4bd92b55d61f84f1612ee4c653d4a3c Mon Sep 17 00:00:00 2001
From: Paris Kasidiaris <paris@sourcelair.com>
Date: Thu, 24 Jan 2019 16:36:47 +0200
Subject: [PATCH 10/17] Progress with actions.

---
 actions/test/.env.test  |  2 ++
 actions/test/Dockerfile | 22 +++++++++++++++++++
 actions/test/entrypoint | 47 +++++++++++++++++++++++++++++++++++++++++
 bin/run-action          | 11 ++++++++++
 ceryx/tests/routes.bats | 10 +++++++++
 5 files changed, 92 insertions(+)
 create mode 100644 actions/test/.env.test
 create mode 100755 actions/test/entrypoint
 create mode 100755 bin/run-action
 create mode 100644 ceryx/tests/routes.bats

diff --git a/actions/test/.env.test b/actions/test/.env.test
new file mode 100644
index 0000000..cbed298
--- /dev/null
+++ b/actions/test/.env.test
@@ -0,0 +1,2 @@
+CERYX_DEBUG=true
+CERYX_DISABLE_LETS_ENCRYPT=true
\ No newline at end of file
diff --git a/actions/test/Dockerfile b/actions/test/Dockerfile
index c2bf854..28c2b98 100644
--- a/actions/test/Dockerfile
+++ b/actions/test/Dockerfile
@@ -5,3 +5,25 @@ LABEL "com.github.actions.description"="Ensure that Ceryx routes requests as exp
 
 LABEL "repository"="http://github.com/sourcelair/ceryx"
 LABEL "maintainer"="Paris Kasidiaris <paris@sourcelair.com>"
+
+WORKDIR /usr/src/app
+
+
+RUN apt-get update && \
+    apt-get install -y curl httpie
+
+ARG docker_version=18.09.1
+RUN curl -sSL https://download.docker.com/linux/static/stable/x86_64/docker-${docker_version}.tgz | tar -xz && \
+    mv docker/docker /usr/local/bin/docker && \
+    rm -rf docker
+
+ARG bats_version=1.1.0
+RUN curl -sSL https://github.com/bats-core/bats-core/archive/v${bats_version}.tar.gz | tar -xz && \
+    ./bats-core-${bats_version}/install.sh /usr/local && \
+    rm -rf ./bats-core-${bats_version}
+
+COPY .env.test /etc/ceryx/.env.test
+
+ARG entrypoint_path=/usr/local/bin/entrypoint
+COPY entrypoint $entrypoint_path
+ENTRYPOINT ["entrypoint"]
\ No newline at end of file
diff --git a/actions/test/entrypoint b/actions/test/entrypoint
new file mode 100755
index 0000000..05ea4df
--- /dev/null
+++ b/actions/test/entrypoint
@@ -0,0 +1,47 @@
+#! /bin/bash
+
+set -eux
+
+echo "Launching Ceryx stack..."
+
+echo "  Launching Redis..."
+redis_container_id=$(docker run -d --label=com.sourcelair.ceryx.action=test redis:3.2.11-alpine)
+echo "  Redis launched. Container ID: ${redis_container_id}."
+
+echo "  Building Ceryx..."
+ceryx_image_id=$(docker build -q ceryx/)
+echo "  Ceryx built. Image ID: ${ceryx_image_id}."
+
+echo "  Launching Ceryx..."
+ceryx_container_id=$(
+    docker run \
+                -d \
+                --label=com.sourcelair.ceryx.action=test \
+                --network=container:${redis_container_id} \
+                --env-file=/etc/ceryx/.env.test ${ceryx_image_id}
+)
+echo "  Ceryx launched. Container ID: ${ceryx_container_id}."
+
+echo "  Building Ceryx API..."
+ceryx_api_image_id=$(docker build -q api/)
+echo "  Ceryx API built. Image ID: ${ceryx_api_image_id}."
+
+echo "  Launching Ceryx API..."
+ceryx_api_container_id=$(
+    docker run \
+                -d \
+                --label=com.sourcelair.ceryx.action=test \
+                --network=container:${redis_container_id} \
+                --env-file=/etc/ceryx/.env.test ${ceryx_api_image_id}
+)
+echo "  Ceryx API launched. Container ID: ${ceryx_api_container_id}."
+
+echo "Ceryx stack launched."
+
+echo "Running Ceryx tests..."
+bats ceryx/tests
+echo "Ran Ceryx tests..."
+
+echo "Cleaning up..."
+docker ps -aq --filter=label=com.sourcelair.ceryx.action=test | xargs docker rm -f 
+echo "Cleaned up."
\ No newline at end of file
diff --git a/bin/run-action b/bin/run-action
new file mode 100755
index 0000000..2600803
--- /dev/null
+++ b/bin/run-action
@@ -0,0 +1,11 @@
+#! /bin/bash
+
+set -eux
+
+image=$(docker build -q actions/$1)
+docker run \
+            -ti \
+            -v $PWD:/github/workspace \
+            -v /var/run/docker.sock:/var/run/docker.sock \
+            --workdir /github/workspace \
+            $image ${@:2}
\ No newline at end of file
diff --git a/ceryx/tests/routes.bats b/ceryx/tests/routes.bats
new file mode 100644
index 0000000..af6e41e
--- /dev/null
+++ b/ceryx/tests/routes.bats
@@ -0,0 +1,10 @@
+#!/usr/bin/env bats
+
+@test "addition using bc" {
+  http http://localhost:5555/api/routes
+}
+
+@test "addition using dc" {
+  # result="$(echo 2 2+p | dc)"
+  # [ "$result" -eq 4 ]
+}

From 83daf28db9385485cf2371b17ec1497826b9a18b Mon Sep 17 00:00:00 2001
From: Paris Kasidiaris <paris@sourcelair.com>
Date: Thu, 24 Jan 2019 16:58:13 +0200
Subject: [PATCH 11/17] Switch to Docker compose

---
 .github/main.workflow       |  9 -------
 .travis.yml                 | 14 ++++++++++-
 CHANGES.txt                 |  1 -
 actions/test/.env.test      |  2 --
 actions/test/Dockerfile     | 29 -----------------------
 actions/test/entrypoint     | 47 -------------------------------------
 bin/run-action              | 11 ---------
 docker-compose.override.yml |  6 +----
 8 files changed, 14 insertions(+), 105 deletions(-)
 delete mode 100644 .github/main.workflow
 delete mode 100644 CHANGES.txt
 delete mode 100644 actions/test/.env.test
 delete mode 100644 actions/test/Dockerfile
 delete mode 100755 actions/test/entrypoint
 delete mode 100755 bin/run-action

diff --git a/.github/main.workflow b/.github/main.workflow
deleted file mode 100644
index 1ac71c8..0000000
--- a/.github/main.workflow
+++ /dev/null
@@ -1,9 +0,0 @@
-workflow "Main" {
-  on = "push"
-  resolves = ["test"]
-}
-
-
-action "test" {
-  uses = "./actions/test"
-}
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
index d4994b5..cabfb87 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,14 +3,26 @@ language: python
 python:
   - 3.6
 
+env:
+  - DOCKER_COMPOSE_VERSION=1.23.2
+
 install:
+  - pip install --upgrade --ignore-installed docker-compose==${DOCKER_COMPOSE_VERSION}
+  - docker-compose build
+
   - pip install pipenv==11.9
   - bash -c "cd api && pipenv install --dev --deploy --system"
 
 services:
   - redis-server
+  - docker
+
+script: docker-compose run api ./bin/test
 
-script: bash -c "cd api && ./bin/test"
+addons:
+  apt:
+    packages:
+      - docker-ce
 
 notifications:
   email: false
diff --git a/CHANGES.txt b/CHANGES.txt
deleted file mode 100644
index cd50846..0000000
--- a/CHANGES.txt
+++ /dev/null
@@ -1 +0,0 @@
-v0.2.0, 05/06/2015 -- Initial release using NGINX OpenResty and Lua extension.
diff --git a/actions/test/.env.test b/actions/test/.env.test
deleted file mode 100644
index cbed298..0000000
--- a/actions/test/.env.test
+++ /dev/null
@@ -1,2 +0,0 @@
-CERYX_DEBUG=true
-CERYX_DISABLE_LETS_ENCRYPT=true
\ No newline at end of file
diff --git a/actions/test/Dockerfile b/actions/test/Dockerfile
deleted file mode 100644
index 28c2b98..0000000
--- a/actions/test/Dockerfile
+++ /dev/null
@@ -1,29 +0,0 @@
-FROM ubuntu:18.04
-
-LABEL "com.github.actions.name"="Ceryx Test"
-LABEL "com.github.actions.description"="Ensure that Ceryx routes requests as expected."
-
-LABEL "repository"="http://github.com/sourcelair/ceryx"
-LABEL "maintainer"="Paris Kasidiaris <paris@sourcelair.com>"
-
-WORKDIR /usr/src/app
-
-
-RUN apt-get update && \
-    apt-get install -y curl httpie
-
-ARG docker_version=18.09.1
-RUN curl -sSL https://download.docker.com/linux/static/stable/x86_64/docker-${docker_version}.tgz | tar -xz && \
-    mv docker/docker /usr/local/bin/docker && \
-    rm -rf docker
-
-ARG bats_version=1.1.0
-RUN curl -sSL https://github.com/bats-core/bats-core/archive/v${bats_version}.tar.gz | tar -xz && \
-    ./bats-core-${bats_version}/install.sh /usr/local && \
-    rm -rf ./bats-core-${bats_version}
-
-COPY .env.test /etc/ceryx/.env.test
-
-ARG entrypoint_path=/usr/local/bin/entrypoint
-COPY entrypoint $entrypoint_path
-ENTRYPOINT ["entrypoint"]
\ No newline at end of file
diff --git a/actions/test/entrypoint b/actions/test/entrypoint
deleted file mode 100755
index 05ea4df..0000000
--- a/actions/test/entrypoint
+++ /dev/null
@@ -1,47 +0,0 @@
-#! /bin/bash
-
-set -eux
-
-echo "Launching Ceryx stack..."
-
-echo "  Launching Redis..."
-redis_container_id=$(docker run -d --label=com.sourcelair.ceryx.action=test redis:3.2.11-alpine)
-echo "  Redis launched. Container ID: ${redis_container_id}."
-
-echo "  Building Ceryx..."
-ceryx_image_id=$(docker build -q ceryx/)
-echo "  Ceryx built. Image ID: ${ceryx_image_id}."
-
-echo "  Launching Ceryx..."
-ceryx_container_id=$(
-    docker run \
-                -d \
-                --label=com.sourcelair.ceryx.action=test \
-                --network=container:${redis_container_id} \
-                --env-file=/etc/ceryx/.env.test ${ceryx_image_id}
-)
-echo "  Ceryx launched. Container ID: ${ceryx_container_id}."
-
-echo "  Building Ceryx API..."
-ceryx_api_image_id=$(docker build -q api/)
-echo "  Ceryx API built. Image ID: ${ceryx_api_image_id}."
-
-echo "  Launching Ceryx API..."
-ceryx_api_container_id=$(
-    docker run \
-                -d \
-                --label=com.sourcelair.ceryx.action=test \
-                --network=container:${redis_container_id} \
-                --env-file=/etc/ceryx/.env.test ${ceryx_api_image_id}
-)
-echo "  Ceryx API launched. Container ID: ${ceryx_api_container_id}."
-
-echo "Ceryx stack launched."
-
-echo "Running Ceryx tests..."
-bats ceryx/tests
-echo "Ran Ceryx tests..."
-
-echo "Cleaning up..."
-docker ps -aq --filter=label=com.sourcelair.ceryx.action=test | xargs docker rm -f 
-echo "Cleaned up."
\ No newline at end of file
diff --git a/bin/run-action b/bin/run-action
deleted file mode 100755
index 2600803..0000000
--- a/bin/run-action
+++ /dev/null
@@ -1,11 +0,0 @@
-#! /bin/bash
-
-set -eux
-
-image=$(docker build -q actions/$1)
-docker run \
-            -ti \
-            -v $PWD:/github/workspace \
-            -v /var/run/docker.sock:/var/run/docker.sock \
-            --workdir /github/workspace \
-            $image ${@:2}
\ No newline at end of file
diff --git a/docker-compose.override.yml b/docker-compose.override.yml
index ab15a66..1c8216f 100644
--- a/docker-compose.override.yml
+++ b/docker-compose.override.yml
@@ -12,11 +12,7 @@ services:
       CERYX_DOCKERIZE_EXTRA_ARGS: ""
 
   api:
-    build:
-      context: ./api
-      dockerfile: Dockerfile
-      args:
-        PIP_REQUIREMENTS_FILE: requirements-dev.txt
+    build: ./api
     volumes:
       - ./api:/opt/ceryx
     environment:

From 08e7736f5906fcf34cd18be84933f3d65044d6cb Mon Sep 17 00:00:00 2001
From: Paris Kasidiaris <paris@sourcelair.com>
Date: Sat, 26 Jan 2019 11:16:17 +0200
Subject: [PATCH 12/17] Introduce tests for Ceryx proxy

---
 .travis.yml             |  1 +
 Dockerfile.test         | 18 ++++++++++++++++++
 ceryx/tests/routes.bats | 31 ++++++++++++++++++++++++++-----
 docker-compose.test.yml | 14 ++++++++++++++
 4 files changed, 59 insertions(+), 5 deletions(-)
 create mode 100644 Dockerfile.test
 create mode 100644 docker-compose.test.yml

diff --git a/.travis.yml b/.travis.yml
index cabfb87..ee26915 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,6 +5,7 @@ python:
 
 env:
   - DOCKER_COMPOSE_VERSION=1.23.2
+  - COMPOSE_FILE=docker-compose.yml:docker-compose.override.yml:docker-compose.test.yml
 
 install:
   - pip install --upgrade --ignore-installed docker-compose==${DOCKER_COMPOSE_VERSION}
diff --git a/Dockerfile.test b/Dockerfile.test
new file mode 100644
index 0000000..81d6114
--- /dev/null
+++ b/Dockerfile.test
@@ -0,0 +1,18 @@
+FROM ubuntu:18.04
+
+RUN apt-get update && \
+    apt-get install -y curl httpie
+
+ARG bats_version=1.1.0
+RUN curl -sSL https://github.com/bats-core/bats-core/archive/v${bats_version}.tar.gz | tar -xz && \
+    ./bats-core-${bats_version}/install.sh /usr/local && \
+    rm -rf ./bats-core-${bats_version}
+
+ENV CERYX_DEBUG true
+ENV CERYX_DISABLE_LETS_ENCRYPT true
+
+WORKDIR /usr/src/app
+
+COPY . .
+
+CMD ["bats", "ceryx/tests"]
diff --git a/ceryx/tests/routes.bats b/ceryx/tests/routes.bats
index af6e41e..ea3a4ce 100644
--- a/ceryx/tests/routes.bats
+++ b/ceryx/tests/routes.bats
@@ -1,10 +1,31 @@
 #!/usr/bin/env bats
 
-@test "addition using bc" {
-  http http://localhost:5555/api/routes
+@test "503 response when no route exist for the given host" {
+  status_code=$(curl -s -o /dev/null -I -w "%{http_code}" -H "Host: i-do-not-exist" http://ceryx)
+  [ $status_code -eq 503 ]
 }
 
-@test "addition using dc" {
-  # result="$(echo 2 2+p | dc)"
-  # [ "$result" -eq 4 ]
+@test "Successful proxying when target exists" {
+  curl -s -o /dev/null \
+       -X POST \
+       -H 'Content-Type: application/json' \
+       -d '{"source": "api-route", "target": "api:5555"}' \
+       http://api:5555/api/routes/
+
+  upstream_status_code=$(curl -s -o /dev/null -I -w "%{http_code}" http://api:5555/api/routes/)
+  ceryx_status_code=$(curl -s -o /dev/null -I -w "%{http_code}" -H "Host: api-route" http://ceryx/api/routes/)
+
+  [ $ceryx_status_code -eq $upstream_status_code ]
+}
+
+@test "301 response and appropriate 'Location' header when enforce_https=true" {
+  curl -s -o /dev/null \
+       -X POST \
+       -H 'Content-Type: application/json' \
+       -d '{"source": "enforced-https-route", "target": "somewhere", "settings":{"enforce_https":true}}' \
+       http://api:5555/api/routes/
+
+  status_code=$(curl -s -o /dev/null -I -w "%{http_code}" -H "Host: enforced-https-route" http://ceryx/)
+
+  [ $status_code -eq 301 ]
 }
diff --git a/docker-compose.test.yml b/docker-compose.test.yml
new file mode 100644
index 0000000..3005c26
--- /dev/null
+++ b/docker-compose.test.yml
@@ -0,0 +1,14 @@
+version: '3.5'
+
+services:
+  test:
+    build:
+      context: .
+      dockerfile: Dockerfile.test
+    environment:
+      CERYX_API_URL: "http://api:${CERYX_API_PORT:-5555}"
+    volumes:
+      - .:/usr/src/app
+    depends_on:
+      - ceryx
+      - api
\ No newline at end of file

From 9d436b39c95392d52e2615b7fec2ab66439101dc Mon Sep 17 00:00:00 2001
From: Paris Kasidiaris <paris@sourcelair.com>
Date: Sat, 26 Jan 2019 11:19:31 +0200
Subject: [PATCH 13/17] Add Ceryx tests to Travis

---
 .travis.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index ee26915..2e586e4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,7 +18,9 @@ services:
   - redis-server
   - docker
 
-script: docker-compose run api ./bin/test
+script:
+  - docker-compose run api ./bin/test
+  - docker-compose run test
 
 addons:
   apt:

From fbf1b9fa192ff399c6c281bfdc366705607ec71d Mon Sep 17 00:00:00 2001
From: Paris Kasidiaris <paris@sourcelair.com>
Date: Sat, 26 Jan 2019 11:22:03 +0200
Subject: [PATCH 14/17] Fix env

---
 .travis.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 2e586e4..180ffc7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,8 +4,7 @@ python:
   - 3.6
 
 env:
-  - DOCKER_COMPOSE_VERSION=1.23.2
-  - COMPOSE_FILE=docker-compose.yml:docker-compose.override.yml:docker-compose.test.yml
+  - DOCKER_COMPOSE_VERSION=1.23.2 COMPOSE_FILE=docker-compose.yml:docker-compose.override.yml:docker-compose.test.yml
 
 install:
   - pip install --upgrade --ignore-installed docker-compose==${DOCKER_COMPOSE_VERSION}

From 9d00bbb9def73446777f83ff28b1d969829f4388 Mon Sep 17 00:00:00 2001
From: Paris Kasidiaris <paris@sourcelair.com>
Date: Sat, 26 Jan 2019 11:35:30 +0200
Subject: [PATCH 15/17] EOL

---
 ceryx/nginx/lualib/https.lua | 2 +-
 ceryx/static/500.html        | 2 +-
 ceryx/static/503.html        | 2 +-
 docker-compose.test.yml      | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ceryx/nginx/lualib/https.lua b/ceryx/nginx/lualib/https.lua
index 953117e..d7b696d 100644
--- a/ceryx/nginx/lualib/https.lua
+++ b/ceryx/nginx/lualib/https.lua
@@ -69,4 +69,4 @@ auto_ssl:set("redis", {
 })
 
 auto_ssl:init()
-require "resty.core"
\ No newline at end of file
+require "resty.core"
diff --git a/ceryx/static/500.html b/ceryx/static/500.html
index 6fa3240..54baedf 100644
--- a/ceryx/static/500.html
+++ b/ceryx/static/500.html
@@ -38,4 +38,4 @@ <h2>Server Error</h2>
         <p>We are sorry, an unexpected error occured while servicing your request.</p>
     </main>
 </body>
-</html> 
\ No newline at end of file
+</html>
diff --git a/ceryx/static/503.html b/ceryx/static/503.html
index feb4356..c25f72b 100644
--- a/ceryx/static/503.html
+++ b/ceryx/static/503.html
@@ -38,4 +38,4 @@ <h2>Service Not Available</h2>
         <p>The website you are trying to access, does not exist.</p>
     </main>
 </body>
-</html> 
\ No newline at end of file
+</html>
diff --git a/docker-compose.test.yml b/docker-compose.test.yml
index 3005c26..e72198b 100644
--- a/docker-compose.test.yml
+++ b/docker-compose.test.yml
@@ -11,4 +11,4 @@ services:
       - .:/usr/src/app
     depends_on:
       - ceryx
-      - api
\ No newline at end of file
+      - api

From 05a27ababa79c07a62de7bd54db8c302837e66c1 Mon Sep 17 00:00:00 2001
From: Paris Kasidiaris <paris@sourcelair.com>
Date: Sat, 26 Jan 2019 20:35:48 +0200
Subject: [PATCH 16/17] Bundle `RUN` directives.

---
 ceryx/Dockerfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ceryx/Dockerfile b/ceryx/Dockerfile
index 5b5c9b9..ea6532c 100644
--- a/ceryx/Dockerfile
+++ b/ceryx/Dockerfile
@@ -17,9 +17,9 @@ RUN curl -fSslL https://github.com/jwilder/dockerize/releases/download/${DOCKERI
 
 # Install lua-resty-auto-ssl for dynamically generating certificates from LE
 # https://github.com/GUI/lua-resty-auto-ssl
-RUN /usr/local/openresty/luajit/bin/luarocks install lua-resty-auto-ssl 0.12.0
-RUN mkdir /etc/resty-auto-ssl/
-RUN chown -R $user:$group /etc/resty-auto-ssl/
+RUN /usr/local/openresty/luajit/bin/luarocks install lua-resty-auto-ssl 0.12.0 &&\
+    mkdir /etc/resty-auto-ssl/ &&\
+    chown -R $user:$group /etc/resty-auto-ssl/
 
 RUN rm -f /usr/local/openresty/nginx/conf/*
 

From 2c4bc049d01116ca4c21afd721150603e63e3946 Mon Sep 17 00:00:00 2001
From: Paris Kasidiaris <paris@sourcelair.com>
Date: Sat, 26 Jan 2019 20:41:36 +0200
Subject: [PATCH 17/17] Comment

---
 ceryx/Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ceryx/Dockerfile b/ceryx/Dockerfile
index ea6532c..59fbb51 100644
--- a/ceryx/Dockerfile
+++ b/ceryx/Dockerfile
@@ -21,6 +21,7 @@ RUN /usr/local/openresty/luajit/bin/luarocks install lua-resty-auto-ssl 0.12.0 &
     mkdir /etc/resty-auto-ssl/ &&\
     chown -R $user:$group /etc/resty-auto-ssl/
 
+# Clean up all existing NGINX configuration
 RUN rm -f /usr/local/openresty/nginx/conf/*
 
 COPY ./nginx/conf /usr/local/openresty/nginx/conf