From cf6b35796796f02b53d0983a7044fbf499340d54 Mon Sep 17 00:00:00 2001
From: Rob Thomas <xrobau@gmail.com>
Date: Fri, 16 Mar 2018 21:17:03 +0000
Subject: [PATCH] Fix brain-typo. Sorry about that!

Somehow I managed to type STIKKIT instead of STIKKED all those times.
I honestly have no idea how I managed to get that into my head.
---
 docker/docker-php-entrypoint | 34 +++++++++++++++++-----------------
 docker/stikked-envvars.txt   | 18 +++++++++---------
 2 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/docker/docker-php-entrypoint b/docker/docker-php-entrypoint
index 24b6327..83447f5 100644
--- a/docker/docker-php-entrypoint
+++ b/docker/docker-php-entrypoint
@@ -1,16 +1,16 @@
 #!/bin/bash
 
 # This is copied from the original docker-php-entrypoint and was updated
-# by the Stikkit container
+# by the Stikked container
 
 set -e
 
-# Check to see where Stikkit might be - If you added Stikkit to this
+# Check to see where Stikked might be - If you added Stikked to this
 # container with something like:
 # ADD https://github.com/claudehohl/Stikked/archive/0.12.0.tar.gz /usr/local
 # then it will be in /usr/local/stikked/Stikked-0.12.0/htdocs/application/config/stikked.php.dist
 
-# If you're using the standard Dockerfile from Stikkit, it will be in
+# If you're using the standard Dockerfile from Stikked, it will be in
 # /var/www/html/htdocs/applcation/config/stikked.php.dist
 
 if [ -e /var/www/html/application/config/stikked.php.dist ]; then
@@ -26,31 +26,31 @@ else
 fi
 
 # Set some default variables
-STIKKIT_SITE_NAME="${STIKKIT_SITE_NAME:-Dockerised Stikkit Container}"
-STIKKIT_BASE_URL="${STIKKIT_BASE_URL:-https://bogus.example.com/}"
-STIKKIT_DB_HOSTNAME="${STIKKIT_DB_HOSTNAME:-db}"
+STIKKED_SITE_NAME="${STIKKED_SITE_NAME:-Dockerised Stikked Container}"
+STIKKED_BASE_URL="${STIKKED_BASE_URL:-https://bogus.example.com/}"
+STIKKED_DB_HOSTNAME="${STIKKED_DB_HOSTNAME:-db}"
 
 # If these aren't set, use MYSQL_ values. If they're not set, then
 # just guess.
-STIKKIT_DB_DATABASE="${STIKKIT_DB_DATABASE:-${MYSQL_DATABASE:-stikked}}"
-STIKKIT_DB_USERNAME="${STIKKIT_DB_USERNAME:-${MYSQL_USER:-stikked}}"
-STIKKIT_DB_PASS="${STIKKIT_DB_PASSWORD:-${MYSQL_PASSWORD:-stikked}}"
+STIKKED_DB_DATABASE="${STIKKED_DB_DATABASE:-${MYSQL_DATABASE:-stikked}}"
+STIKKED_DB_USERNAME="${STIKKED_DB_USERNAME:-${MYSQL_USER:-stikked}}"
+STIKKED_DB_PASS="${STIKKED_DB_PASSWORD:-${MYSQL_PASSWORD:-stikked}}"
 
 # If there's not a cron key, set a random one.
-if [ ! "$STIKKIT_CRON_KEY" ]; then
+if [ ! "$STIKKED_CRON_KEY" ]; then
 	# Note - this is not very random. But it'll do in a pinch.
-	STIKKIT_CRON_KEY=$RANDOM.$RANDOM.$RANDOM.$RANDOM
+	STIKKED_CRON_KEY=$RANDOM.$RANDOM.$RANDOM.$RANDOM
 fi
 
 # Put the cron file in place
-echo "*/5 * * * * root curl --silent http://localhost/cron/$STIKKIT_CRON_KEY" > /etc/cron.d/stikkit
+echo "*/5 * * * * root curl --silent http://localhost/cron/$STIKKED_CRON_KEY" > /etc/cron.d/stikked
 
-# This gets all environment variables that start with STIKKIT_
-svars=$(set | grep \^STIKKIT_ | cut -d= -f1)
+# This gets all environment variables that start with STIKKED_
+svars=$(set | grep \^STIKKED_ | cut -d= -f1)
 for svar in $svars; do
-	# Remove STIKKIT_ from the front, and convert it to lower
-	# case (STIKKIT_CRON_KEY is now cron_key)
-        val=$(echo $svar | sed 's/STIKKIT_\(.*\)/\L\1/')
+	# Remove STIKKED_ from the front, and convert it to lower
+	# case (STIKKED_CRON_KEY is now cron_key)
+        val=$(echo $svar | sed 's/STIKKED_\(.*\)/\L\1/')
         # if it has a /, escape it - for example, in a path or URL.
         FIXED=$(echo ${!svar} | sed 's_/_\\/_g')
 	# Tell the user what's going on
diff --git a/docker/stikked-envvars.txt b/docker/stikked-envvars.txt
index d511f70..5a74990 100644
--- a/docker/stikked-envvars.txt
+++ b/docker/stikked-envvars.txt
@@ -8,20 +8,20 @@ STIKKED_SITE_NAME=Stikked
 STIKKED_BASE_URL=http://stikked.local/
 
 # This should match the database container name
-STIKKIT_DB_HOSTNAME=db
+STIKKED_DB_HOSTNAME=db
 
 # These do NOT need to be set, as they will be inherited from
 # the MYSQL_DATABASE settings above. However, you can set them
 # if you are using a seperately managed database.
-#STIKKIT_DB_DATABASE=stikked
-#STIKKIT_DB_USERNAME=stikked
-#STIKKIT_DB_PASS=stikked
+#STIKKED_DB_DATABASE=stikked
+#STIKKED_DB_USERNAME=stikked
+#STIKKED_DB_PASS=stikked
 
 # Other random examples
-STIKKIT_DISALLOW_SEARCH_ENGINES="true"
-STIKKIT_JS_EDITOR="codemirror"
+STIKKED_DISALLOW_SEARCH_ENGINES="true"
+STIKKED_JS_EDITOR="codemirror"
 
 # Example of enabling CAPTCHA
-#STIKKIT_ENABLE_CAPTCHA="true"
-#STIKKIT_RECAPTCHA_PUBLICKEY="_replace_this_with_your_public_key_"
-#STIKKIT_RECAPTCHA_PRIVATEKEY="_replace_this_with_your_private_key_"
+#STIKKED_ENABLE_CAPTCHA="true"
+#STIKKED_RECAPTCHA_PUBLICKEY="_replace_this_with_your_public_key_"
+#STIKKED_RECAPTCHA_PRIVATEKEY="_replace_this_with_your_private_key_"