From 351809bada9eb1567c0be6c5519ecc6798506909 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stephan=20Mei=C3=9Fl?= <stephan@meissl.name>
Date: Fri, 7 Oct 2016 14:20:06 +0200
Subject: [PATCH] Adding time parameter to authorization template.

---
 install/ngeo-install.sh                                        | 2 +-
 jenkins/prepare_instance.sh                                    | 2 +-
 ngeo-b_autotest                                                | 2 +-
 ngeo_browse_server/control/templates/test_control/mapcache.xml | 2 +-
 vagrant/shares/httpd/www_root/cache/mapcache.xml               | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/install/ngeo-install.sh b/install/ngeo-install.sh
index 7b479622..ca43b0ff 100755
--- a/install/ngeo-install.sh
+++ b/install/ngeo-install.sh
@@ -388,7 +388,7 @@ EOF
 <?xml version="1.0" encoding="UTF-8"?>
 <mapcache>
     <auth_method name="cmdlineauth" type="cmd">
-        <template>/usr/bin/python /usr/bin/request_authorization.py -b http://127.0.0.1:8000/webserver -u :user -l :tileset</template>
+        <template>/usr/bin/python /usr/bin/request_authorization.py -b http://127.0.0.1:8000/webserver -u :user -l :tileset -t :time</template>
         <user_header>$MAPCACHE_USER_HEADER</user_header>
         <auth_cache type="memcache">
             <expires>1000</expires>
diff --git a/jenkins/prepare_instance.sh b/jenkins/prepare_instance.sh
index 1257d562..cdba9aa9 100644
--- a/jenkins/prepare_instance.sh
+++ b/jenkins/prepare_instance.sh
@@ -121,7 +121,7 @@ cat << EOF > "$MAPCACHE_DIR/$MAPCACHE_CONF"
 <?xml version="1.0" encoding="UTF-8"?>
 <mapcache>
   <auth_method name="cmdlineauth" type="cmd">
-    <template>/usr/bin/python /usr/bin/request_authorization.py -b http://127.0.0.1:8000/authorized -u :user -l :tileset</template>
+    <template>/usr/bin/python /usr/bin/request_authorization.py -b http://127.0.0.1:8000/authorized -u :user -l :tileset -t :time</template>
     <user_header>SP-Person-Identifier</user_header>
     <auth_cache type="memcache">
       <expires>1000</expires>
diff --git a/ngeo-b_autotest b/ngeo-b_autotest
index 3dda897a..b0f6d266 160000
--- a/ngeo-b_autotest
+++ b/ngeo-b_autotest
@@ -1 +1 @@
-Subproject commit 3dda897aca393410e92dbf1b6656a49dcdbad873
+Subproject commit b0f6d2669590b1cb2b4268e4ab7f73f49f194ba0
diff --git a/ngeo_browse_server/control/templates/test_control/mapcache.xml b/ngeo_browse_server/control/templates/test_control/mapcache.xml
index 7acc676d..9462ecdd 100644
--- a/ngeo_browse_server/control/templates/test_control/mapcache.xml
+++ b/ngeo_browse_server/control/templates/test_control/mapcache.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <mapcache>
     <auth_method name="cmdlineauth" type="cmd">
-        <template>request_authorization.py --layer :tileset --user :user --baseurl http://www.example.com/</template>
+        <template>request_authorization.py --layer :tileset --user :user -t :time --baseurl http://www.example.com/</template>
         <user_header>user</user_header>
         <auth_cache type="memcache">
             <expires>1000</expires>
diff --git a/vagrant/shares/httpd/www_root/cache/mapcache.xml b/vagrant/shares/httpd/www_root/cache/mapcache.xml
index 93e64d6b..fb0828ae 100755
--- a/vagrant/shares/httpd/www_root/cache/mapcache.xml
+++ b/vagrant/shares/httpd/www_root/cache/mapcache.xml
@@ -1,6 +1,6 @@
 <mapcache>
   <auth_method name="cmdlineauth" type="cmd">
-    <template>/usr/bin/python /usr/bin/request_authorization.py -b http://127.0.0.1:8000/authorized -u :user -l :tileset</template>
+    <template>/usr/bin/python /usr/bin/request_authorization.py -b http://127.0.0.1:8000/authorized -u :user -l :tileset -t :time</template>
     <user_header>SP-Person-Identifier</user_header>
     <auth_cache type="memcache">
       <expires>1000</expires>