Skip to content

Issue217 dymamic config params #240

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 7, 2015
Merged

Issue217 dymamic config params #240

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
741abfb
- Made WAYBACK_BASEDIR, WAYBACK_URL_SCHEME, WAYBACK_URL_HOST=158.39.1…
RogerMathisen Apr 20, 2015
7b37a69
Added Release notes.
RogerMathisen Apr 20, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/site/xdoc/release_notes.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
<li>WatchedCDXSource now monitors directories for new CDX files. <a href="https://github.com/iipc/openwayback/pull/181">#181</a></li>
<li>Minor fixes to replace hardcoded port numbers aun URL prefixes with placeholders. <a href="https://github.com/iipc/openwayback/pull/223">#223</a></li>
<li>Require Java 7.<a href="https://github.com/iipc/openwayback/pull/178">#178</a></li>
<li>Environment variables for config options.<a href="https://github.com/iipc/openwayback/pull/217">#217</a></li>
</ul>
</subsection>
<subsection name="Bug Fixes">
Expand Down
35 changes: 21 additions & 14 deletions wayback-webapp/src/main/webapp/WEB-INF/wayback.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,21 +11,28 @@
locationdb storage.
-->

<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
<property name="properties">
<value>
wayback.basedir=/tmp/openwayback
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
<property name="properties">
<value>

<!-- Customize these basic placeholders. -->
WAYBACK_BASEDIR=/tmp/openwayback
WAYBACK_URL_SCHEME=http
WAYBACK_URL_HOST=localhost
WAYBACK_URL_PORT=8080

<!-- Environment variable overrides (only if present). No need to customize these. -->
wayback.basedir=#{ systemEnvironment['WAYBACK_BASEDIR'] ?: '${WAYBACK_BASEDIR}' }
wayback.url.scheme=#{ systemEnvironment['WAYBACK_URL_SCHEME'] ?: '${WAYBACK_URL_SCHEME}' }
wayback.url.host=#{ systemEnvironment['WAYBACK_URL_HOST'] ?: '${WAYBACK_URL_HOST}' }
wayback.url.port=#{ systemEnvironment['WAYBACK_URL_PORT'] ?: '${WAYBACK_URL_PORT}' }

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.prefix=${wayback.url.scheme}://${wayback.url.host}:${wayback.url.port}
</value>
</property>
</bean>
wayback.archivedir.1=${wayback.basedir}/files1/
wayback.archivedir.2=${wayback.basedir}/files2/
wayback.url.prefix=${wayback.url.scheme}://${wayback.url.host}:${wayback.url.port}
</value>
</property>
</bean>

<bean id="waybackCanonicalizer" class="org.archive.wayback.util.url.AggressiveUrlCanonicalizer" />

Expand Down