fix

.travis.yml

@@ -1,4 +1,6 @@
 language: python
+services:
+- docker
 sudo: required
 env:
   global:

Dockerfile

@@ -5,6 +5,10 @@ RUN apt-get update && \
     apt-get install -y python python-dev python-pip python-virtualenv zip rsync default-jdk && \
     rm -rf /var/lib/apt/lists/*
 
+ENV JAVA_HOME /usr/lib/jvm/default-jdk/
+RUN export JAVA_HOME
+RUN export PATH="$JAVA_HOME/bin:$PATH"
+
 # Create app directory
 WORKDIR /usr/src/app
 

generate.sh

@@ -43,7 +43,7 @@ function generateAPIDocs {
   fi
 
   if [[  -n "${JAVADOC_PATH}" ]]; then
-    javadoc -sourcepath ${1}/${JAVADOC_PATH} -d ${2}/javadoc -subpackages . >> ${LOGFILE} 2>>${LOGFILE}
+    javadoc -sourcepath ${1}/${JAVADOC_PATH} -encoding UTF-8 -d ${2}/javadoc -subpackages .
   fi
 }
 

kubernetes/images/yaydoc/Dockerfile

@@ -21,6 +21,9 @@ RUN apt-get update && \
     apt-get install -y python python-dev python-pip python-virtualenv zip rsync default-jdk && \
     rm -rf /var/lib/apt/lists/*
 
+ENV JAVA_HOME /usr/lib/jvm/default-java/
+RUN export JAVA_HOME
+
 RUN bash setup.sh
 
 WORKDIR $INSTALL_PATH/yaydoc

kubernetes/yamls/yaydoc/configmap.yml

@@ -4,16 +4,16 @@ metadata:
   namespace: web
 data:
   DEPLOYMENT: "true"
-  ENCRYPTION_KEY: "xxxxxxxxxxxxxxxxxxxxxxxxxxx"
-  GITHUB_CLIENT_ID: "xxxxxxxxxxxxxxxxxxxxx"
-  GITHUB_CLIENT_SECRET: "xxxxxxxxxxxxxxxx"
-  GITHUB_CALLBACK_URL: "xxxxxxxxxxxxxxxxxxxxxxxxxx"
-  HEROKU_CLIENT_ID: "xxxxxxxxxxxxxxxxx"
-  HEROKU_CLIENT_SECRET: "xxxxxxxxxxxx"
-  HEROKU_CALLBACK_URL: "xxxxxxxxxxxxxxxxxxxxxxx"
-  HOSTNAME: "xxxxxxxxxxxx"
-  MONGODB_URI: "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
-  SECRET: "xxxxxxxxxxx"
-  SENDGRID_USERNAME: "xxxxxxxxxxxxx"
-  SENDGRID_PASSWORD: "xxxxxxxxxxxx"
+  ENCRYPTION_KEY: "ABCGDHEUSHFKIRMJSDFIUTEHFNGOWPOR"
+  GITHUB_CLIENT_ID: "4767e61ff6d282324fc7"
+  GITHUB_CLIENT_SECRET: "178de364c6a4683ff951ebf53b95050405a7f230"
+  GITHUB_CALLBACK_URL: "http://yaydoc.tk/auth/github/callback"
+  HEROKU_CLIENT_ID: "9d193bc1-1175-48f0-965c-80db7ce8761d"
+  HEROKU_CLIENT_SECRET: "3665ea6b-aaf1-4011-b225-d2a4b199a569"
+  HEROKU_CALLBACK_URL: "https://yaydoc.tk/auth/heroku/callback"
+  HOSTNAME: "yaydoc.tk"
+  MONGODB_URI: "mongodb://ujjwalbhardwaj:[email protected]:57712/yaydoctk"
+  SECRET: "anabsolutesecret"
+  SENDGRID_USERNAME: "xxxxxxxxx"
+  SENDGRID_PASSWORD: "xxxxxxxxx"
 kind: ConfigMap

modules/scripts/config/utils.py

@@ -23,7 +23,7 @@ def type_mismatch(current_key, value):
                     # any time would be valid since it can always be wrapped
                     # as a single element list
                     if base[key] is None or isinstance(base[key], list):
-                        continue
+                        base[key] = value
                     else:
                         type_mismatch(key, value)
                 else: