Merge pull request #451 from teiling88/misc/improve-travis-build

misc - adding SESSION_DOMAIN placeholder to improve travis build
OpencachingDeutschland · Jan 25, 2017 · 3378c06 · 3378c06
2 parents 758723e + 9f2083a
commit 3378c06
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/.psh.yaml b/.psh.yaml
@@ -27,11 +27,13 @@ const:
   DB_HOST: "localhost"
   FRONTEND_URL: "http://local.team-opencaching.de"
   DIR: "__DIR__"
+  SESSION_DOMAIN: ".team-opencaching.de"
 
 environments:
   travis-ci:
     paths:
       - "dev-ops/travis-ci/actions"
     const:
       DB_HOST: '127.0.0.1'
-      FRONTEND_URL: "http://127.0.0.1"
+      FRONTEND_URL: "http://localhost"
+      SESSION_DOMAIN: "localhost"
diff --git a/bin/provision.sh b/bin/provision.sh
@@ -1,6 +1,5 @@
 #!/usr/bin/env bash
 
-# enter url for SQL dump. e.g. http://opencaching.de/dump.sql
 function label {
     echo -e "\n\033[0;34m=> ${1}\033[0m\n"
 }

diff --git a/dev-ops/local.team-opencaching.de/templates/config2-settings.inc.php.tpl b/dev-ops/local.team-opencaching.de/templates/config2-settings.inc.php.tpl
@@ -61,7 +61,7 @@ $opt['lib']['w3w']['apikey'] = 'X27PDW41';
 $opt['session']['mode'] = SAVE_COOKIE;
 $opt['session']['cookiename'] = 'ocvagrant'; // only with SAVE_COOKIE
 $opt['session']['path'] = '/';
-$opt['session']['domain'] = '.team-opencaching.de';    // may be overwritten by $opt['domain'][...]['cookiedomain']
+$opt['session']['domain'] = '__SESSION_DOMAIN__';    // may be overwritten by $opt['domain'][...]['cookiedomain']
 
 /* If the Referer was sent by the client and the substring was not found,
  * the embedded session id will be marked as invalid.

diff --git a/htdocs/api/rot13.php b/htdocs/api/rot13.php
@@ -1,7 +1,6 @@
 <?php
 /***************************************************************************
- *  For license information see doc/license.txt
- *
+ *  For license information see doc/license.txt *
  *
  *  Rot13 hint decoder
  ***************************************************************************/

diff --git a/htdocs/lib/settings-dev.inc.php b/htdocs/lib/settings-dev.inc.php
@@ -114,8 +114,8 @@
 $zip_basedir = $dev_basepath . ($dev_codepath == '*' ? '' : $dev_codepath . 'htdocs/') . 'download/zip/';
 $zip_wwwdir = 'download/zip/';
 
-$googlemap_key = "<key>";
-$googlemap_type = "G_MAP_TYPE"; // alternativ: _HYBRID_TYPE
+$googlemap_key = '<key>';
+$googlemap_type = 'G_MAP_TYPE'; // alternativ: _HYBRID_TYPE
 
 $opt['translate']['debug'] = false;