Merge branch 'master' into dev

.travis.yml

@@ -22,6 +22,7 @@ before_script:
   #- travis_retry go get honnef.co/go/tools/cmd/megacheck                                # Badass static analyzer/linter
   # - travis_retry go get github.com/fzipp/gocyclo                                       # Not sure what this is
 
+
 # Run bindata for assets
   - make bindata
 

sample-simple.cfg

@@ -5,7 +5,10 @@
 # General configuration.
 debug = true
 #syslog = true
+
 #################
+# yubikeyclientid = "yubi-api-clientid"
+# yubikeysecret = "yubi-api-secret"
 
 #################
 # Server configuration.

scripts/docker/start.sh

@@ -7,6 +7,7 @@ if [ ! -f /app/config/config.cfg ] ; then
   cp /app/docker/default-config.cfg /app/config/config.cfg || exit 1
  fi
 
+
 echo "";
 echo "Version and build information:";
 echo "";
@@ -14,6 +15,7 @@ echo "";
 # Output version string to logs
 /app/glauth --version
 
+
 echo "";
 echo "Starting GLauth now.";
 echo "";