From f53b22a56f31f7ea78b0f2272713f82e02d048db Mon Sep 17 00:00:00 2001
From: Sawood Alam <ibnesayeed@gmail.com>
Date: Tue, 17 Feb 2015 23:24:02 -0500
Subject: [PATCH 1/3] Added ENV vars equivalent to four basic placeholder
 properties

---
 wayback-webapp/src/main/webapp/WEB-INF/wayback.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/wayback-webapp/src/main/webapp/WEB-INF/wayback.xml b/wayback-webapp/src/main/webapp/WEB-INF/wayback.xml
index 490f2cac5a..9d3e2185bb 100644
--- a/wayback-webapp/src/main/webapp/WEB-INF/wayback.xml
+++ b/wayback-webapp/src/main/webapp/WEB-INF/wayback.xml
@@ -14,14 +14,14 @@
   <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
     <property name="properties">
       <value>
-        wayback.basedir=/tmp/openwayback
-        
+        wayback.basedir=#{systemEnvironment['WAYBACK_BASEDIR']?:'/tmp/openwayback'}
+
         wayback.archivedir.1=${wayback.basedir}/files1/
         wayback.archivedir.2=${wayback.basedir}/files2/
-        
-        wayback.url.scheme=http
-        wayback.url.host=localhost
-        wayback.url.port=8080
+
+        wayback.url.scheme=#{systemEnvironment['WAYBACK_URL_SCHEME']?:'http'}
+        wayback.url.host=#{systemEnvironment['WAYBACK_URL_HOST']?:'localhost'}
+        wayback.url.port=#{systemEnvironment['WAYBACK_URL_PORT']?:'8080'}
         wayback.url.prefix=${wayback.url.scheme}://${wayback.url.host}:${wayback.url.port}
       </value>
     </property>

From 2c6ea4627fd29dfa4001c010fcf132809caa701c Mon Sep 17 00:00:00 2001
From: Sawood Alam <ibnesayeed@gmail.com>
Date: Wed, 25 Feb 2015 19:13:47 -0500
Subject: [PATCH 2/3] Separate ENV var overrides while keeping basic
 customizations easy

---
 .../src/main/webapp/WEB-INF/wayback.xml       | 28 ++++++++++++++-----
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/wayback-webapp/src/main/webapp/WEB-INF/wayback.xml b/wayback-webapp/src/main/webapp/WEB-INF/wayback.xml
index 9d3e2185bb..f0e634698b 100644
--- a/wayback-webapp/src/main/webapp/WEB-INF/wayback.xml
+++ b/wayback-webapp/src/main/webapp/WEB-INF/wayback.xml
@@ -14,15 +14,29 @@
   <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
     <property name="properties">
       <value>
-        wayback.basedir=#{systemEnvironment['WAYBACK_BASEDIR']?:'/tmp/openwayback'}
-
+        <!-- Customize these basic placeholders. -->
+        wayback.basedir.default=/tmp/openwayback
+        wayback.url.scheme.default=http
+        wayback.url.host.default=localhost
+        wayback.url.port.default=8080
+
+        <!-- Environment variables (if present) override defaults. No need to customize these. -->
+        wayback.basedir=#{ systemEnvironment['WAYBACK_BASEDIR'] ?: '${wayback.basedir.default}' }
+        wayback.url.scheme=#{ systemEnvironment['WAYBACK_URL_SCHEME'] ?: '${wayback.url.scheme.default}' }
+        wayback.url.host=#{ systemEnvironment['WAYBACK_URL_HOST'] ?: '${wayback.url.host.default}' }
+        wayback.url.port=#{ systemEnvironment['WAYBACK_URL_PORT'] ?: '${wayback.url.port.default}' }
+
+        <!-- No need to edit this setting unless deploying in a non-ROOT context
+             or using a load balancer, in which case configure it with the frontend URL prefix. -->
+        wayback.url.prefix.default=${wayback.url.scheme}://${wayback.url.host}:${wayback.url.port}
+
+        <!-- Environment variable (if present) overrides default. No need to customize this. -->
+        wayback.url.prefix=#{ systemEnvironment['WAYBACK_URL_PREFIX'] ?: '${wayback.url.prefix.default}' }
+
+        <!-- Customize or add additional placeholders if needed to use elsewhere.
+             Check BDBCollection.xml for following placeholders being used. -->
         wayback.archivedir.1=${wayback.basedir}/files1/
         wayback.archivedir.2=${wayback.basedir}/files2/
-
-        wayback.url.scheme=#{systemEnvironment['WAYBACK_URL_SCHEME']?:'http'}
-        wayback.url.host=#{systemEnvironment['WAYBACK_URL_HOST']?:'localhost'}
-        wayback.url.port=#{systemEnvironment['WAYBACK_URL_PORT']?:'8080'}
-        wayback.url.prefix=${wayback.url.scheme}://${wayback.url.host}:${wayback.url.port}
       </value>
     </property>
   </bean>

From f2386f2427c72ad1a8d112e7b20f29a699810fae Mon Sep 17 00:00:00 2001
From: Sawood Alam <ibnesayeed@gmail.com>
Date: Thu, 26 Feb 2015 10:47:53 -0500
Subject: [PATCH 3/3] Added the change in the release notes.

---
 src/site/xdoc/release_notes.xml | Bin 41474 -> 41821 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/src/site/xdoc/release_notes.xml b/src/site/xdoc/release_notes.xml
index 246caa7c8668ce064d62675a8ddec0927ec4ff93..0fcec404ec0b984a117019548645176c05122773 100644
GIT binary patch
delta 268
zcmZoV!gTi-(}qyy$sYvR(}F9DOHy+cQuE3(i}LewQ}ap`$`Xq*6O(dMixrX+^AwU&
z6-tX!Qxr<_74pkci;6N+QWc8xb5j+P5{omF6_WGw(lXOaixNvR^Ye-o$}>wc@=Hq;
zk~0$1GxO3FN-|OvB7A)&J93-Y8W|ZdkN}kIlz}>I^b_qA67y0fD+=jNKA_IwU}#Q)
h89=2VV+_qf#@OiRWZH2}{upC0Ie|%W^L*yyc>sNWJ?{Vj

delta 14
Wcmcb6jH&4e(}qyy%^O(O&I155!Um`S