Skip to content

Added ENV vars equivalent to four basic placeholder properties #220

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

Closed
wants to merge 3 commits into from
Closed

Added ENV vars equivalent to four basic placeholder properties #220

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f53b22a
Added ENV vars equivalent to four basic placeholder properties
ibnesayeed Feb 18, 2015
2c6ea46
Separate ENV var overrides while keeping basic customizations easy
ibnesayeed Feb 26, 2015
f2386f2
Added the change in the release notes.
ibnesayeed Feb 26, 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
Binary file modified src/site/xdoc/release_notes.xml
View file
Open in desktop
Binary file not shown.
28 changes: 21 additions & 7 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 @@ -14,15 +14,29 @@
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
<property name="properties">
<value>
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=http
wayback.url.host=localhost
wayback.url.port=8080
wayback.url.prefix=${wayback.url.scheme}://${wayback.url.host}:${wayback.url.port}
</value>
</property>
</bean>
Expand Down