Merge pull request #112 from lancachenet/switcheroo

Rebase generic off monolithic

.circleci/config.yml

@@ -78,7 +78,7 @@ jobs:
       - run:
           name: "Request API to build children"
           command: |
-              for child in {"monolithic"}; do
-                 echo "Asking API to trigger build for $child"
-                 curl -X POST --header "Content-Type: application/json" -d '{"branch":"master"}' https://circleci.com/api/v1.1/project/github/lancachenet/$child/build?circle-token=${CIRCLE_API_USER_TOKEN}
-              done
+              #for child in {"monolithic"}; do
+              #   echo "Asking API to trigger build for $child"
+              #   curl -X POST --header "Content-Type: application/json" -d '{"branch":"master"}' https://circleci.com/api/v1.1/project/github/lancachenet/$child/build?circle-token=${CIRCLE_API_USER_TOKEN}
+              #done

Dockerfile

@@ -1,8 +1,9 @@
-FROM lancachenet/ubuntu-nginx:latest
-MAINTAINER LanCache.Net Team <[email protected]>
+FROM lancachenet/monolithic:latest
+LABEL version=3
+LABEL description="Single aggressive caching container for caching game content at LAN parties."
+LABEL maintainer="LanCache.Net Team <[email protected]>"
 
 ENV GENERICCACHE_VERSION=2 \    
-    WEBUSER=www-data \
 	CACHE_MODE=generic \
     CACHE_MEM_SIZE=500m \
     CACHE_DISK_SIZE=1000000m \
@@ -15,19 +16,7 @@ ENV GENERICCACHE_VERSION=2 \
 
 COPY overlay/ /
 
-RUN rm /etc/nginx/sites-enabled/* /etc/nginx/stream-enabled/* ;\
-    rm /etc/nginx/conf.d/gzip.conf ;\
-    chmod 754  /var/log/tallylog ; \
-    id -u ${WEBUSER} &> /dev/null || adduser --system --home /var/www/ --no-create-home --shell /bin/false --group --disabled-login ${WEBUSER} ;\
-    chmod 755 /scripts/*			;\
-	mkdir -m 755 -p /data/cache		;\
-	mkdir -m 755 -p /data/info		;\
-	mkdir -m 755 -p /data/logs		;\
-	mkdir -m 755 -p /tmp/nginx/		;\
-	chown -R ${WEBUSER}:${WEBUSER} /data/	;\
-	mkdir -p /etc/nginx/sites-enabled	;\
-	ln -s /etc/nginx/sites-available/10_generic.conf /etc/nginx/sites-enabled/10_generic.conf; \
-	ln -s /etc/nginx/stream-available/10_sni.conf /etc/nginx/stream-enabled/10_sni.conf
+RUN rm -rf /data/cachedomains/*
 
 VOLUME ["/data/logs", "/data/cache", "/var/www"]
 

goss.yaml

@@ -13,7 +13,7 @@ command:
     exit-status: 0
     stdout:
     - Succesfully Cached
-    timeout: 10000
+    timeout: 20000
 process:
   nginx:
     running: true

overlay/etc/nginx/conf.d/30_maps.conf

@@ -0,0 +1 @@
+#no maps needed in generic

overlay/hooks/entrypoint-pre.d/15_generate_maps.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+# no maps needed

overlay/scripts/cache_test.sh

@@ -1,13 +1,29 @@
 #!/bin/bash
 set -e
-pageload1=`curl http://www.lagado.com/tools/cache-test --resolve www.lagado.com:80:127.0.0.1`
+pageload1=`curl http://www.worldtimeapi.org/api/timezone/ETC/GMT --resolve www.worldtimeapi.org:80:127.0.0.1`
 sleep 5
-pageload2=`curl http://www.lagado.com/tools/cache-test --resolve www.lagado.com:80:127.0.0.1`
-
+pageload2=`curl http://www.worldtimeapi.org/api/timezone/ETC/GMT --resolve www.worldtimeapi.org:80:127.0.0.1`
+sleep 5
+pageload3=`curl http://worldtimeapi.org/api/timezone/ETC/GMT --resolve worldtimeapi.org:80:127.0.0.1`
+sleep 5
+pageload4=`curl http://worldtimeapi.org/api/timezone/ETC/GMT --resolve worldtimeapi.org:80:127.0.0.1`
 if [ "$pageload1" == "$pageload2" ]; then
-	echo "Succesfully Cached"
-	exit 0
+	if [ "$pageload3" == "$pageload4" ]; then
+		if [ "$pageload1" == "$pageload4" ]; then
+			echo "Succesfully Cached"
+			exit 0
+		else
+			#In generic pages 1+4 should be identical as all domains are cached equally
+			echo "Error caching test page, pages 1+4 are different"
+			exit -3
+		fi
+
+	else
+		echo "Error caching test page, pages 3+4 different"
+		exit -2
+	fi
+
 else
-	echo "Error caching test page, pages differed"
+	echo "Error caching test page, pages 1+2 different"
 	exit -1
 fi