From 35ef1c624ec3fd1b4ab8ad855b783a966a9e607f Mon Sep 17 00:00:00 2001 From: Timothy Prepscius Date: Tue, 20 Aug 2013 23:31:51 -0400 Subject: [PATCH] first cut put the hosts from the config instead of static code --- build/compile-web-html | 13 +++++++++++++ deploy/config/title | 1 + web/client/index.html | 10 +++++----- web/common/Link.ConstantsDev.html | 12 ++++++------ web/common/Link.ConstantsProd.html | 12 ++++++------ web/common/mEmbeddedResources.js | 4 ++-- 6 files changed, 33 insertions(+), 19 deletions(-) create mode 100644 deploy/config/title diff --git a/build/compile-web-html b/build/compile-web-html index 9132626..9c8dc65 100755 --- a/build/compile-web-html +++ b/build/compile-web-html @@ -3,6 +3,13 @@ V=$1 M=$2 +APP_TITLE=`cat ../deploy/config/title` +HOST_PRIMARY=`cat ../deploy/config/hosts/$M` +HOST_AUTH=`cat ../deploy/config/hosts/auth_$M` +HOST_TOMCAT=`cat ../deploy/config/hosts/tomcat_$M` +HOST_WEB=`cat ../deploy/config/hosts/web_$M` +` + dst=../gwt/war cmn_src=../web/common client_src=../web/client @@ -19,6 +26,12 @@ function replaceStrings() { sed -i '' -f replace_html_$M.sed $1 sed -i '' -e s/__VERSION__/$V/g $1 sed -i '' -e s/__THIS_YEAR__/2013/g $1 + + sed -i '' -e s/{##TITLE##}/$APP_TITLE/g $1 + sed -i '' -e s/{##HOST_PRIMARY##}/$HOST_PRIMARY/g $1 + sed -i '' -e s/{##HOST_AUTH##}/$HOST_AUTH/g $1 + sed -i '' -e s/{##HOST_TOMCAT##}/$HOST_TOMCAT/g $1 + sed -i '' -e s/{##HOST_WEB##}/$HOST_WEB/g $1 } echo Compiling CSS/JS diff --git a/deploy/config/title b/deploy/config/title new file mode 100644 index 0000000..f13a556 --- /dev/null +++ b/deploy/config/title @@ -0,0 +1 @@ +Title diff --git a/web/client/index.html b/web/client/index.html index b723d56..e3dbadb 100644 --- a/web/client/index.html +++ b/web/client/index.html @@ -32,10 +32,10 @@
- Mailiverse! (__VERSION__) + {##TITLE##}! (__VERSION__) - New to Mailiverse? + New to {##TITLE##}?
@@ -43,7 +43,7 @@
-

Mailiverse

+

{##TITLE##}

Secure mail for everyone.

  • @@ -124,7 +124,7 @@ -

    Mailiverse

    +

    {##TITLE##}

diff --git a/web/common/Link.ConstantsDev.html b/web/common/Link.ConstantsDev.html index 358c8f0..6e642bd 100644 --- a/web/common/Link.ConstantsDev.html +++ b/web/common/Link.ConstantsDev.html @@ -1,12 +1,12 @@ Constants = { - HOST : "mailiverse.com", - ATHOST : "@mailiverse.com", + HOST : "{##HOST_PRIMARY##}", + ATHOST : "@{##HOST_PRIMARY##}", - AUTH_HOST : "red", - TOMCAT_HOST : "red:8080", - WEB_HOST : "white:8000", - TOMCAT_SERVER : "https://red:8080/Mailiverse/" + AUTH_HOST : "{##HOST_AUTH##}", + TOMCAT_HOST : "{##HOST_TOMCAT##}", + WEB_HOST : "{##HOST_WEB##}", + TOMCAT_SERVER : "https://{##HOST_TOMCAT##}/Mailiverse/" }; diff --git a/web/common/Link.ConstantsProd.html b/web/common/Link.ConstantsProd.html index de9f906..65dc5a9 100644 --- a/web/common/Link.ConstantsProd.html +++ b/web/common/Link.ConstantsProd.html @@ -1,10 +1,10 @@ Constants = { - HOST : "mailiverse.com", - ATHOST : "@mailiverse.com", + HOST : "{##HOST_PRIMARY##}", + ATHOST : "@{##HOST_PRIMARY##}", - AUTH_HOST : "mail.mailiverse.com", - TOMCAT_HOST : "mail.mailiverse.com", - WEB_HOST : "www.mailiverse.com", - TOMCAT_SERVER : "https://mail.mailiverse.com/Mailiverse/" + AUTH_HOST : "{##HOST_AUTH##}", + TOMCAT_HOST : "{##HOST_TOMCAT##}", + WEB_HOST : "{##HOST_WEB##}", + TOMCAT_SERVER : "https://{##HOST_TOMCAT##}/Mailiverse/" }; diff --git a/web/common/mEmbeddedResources.js b/web/common/mEmbeddedResources.js index dcd8c12..13181a6 100644 --- a/web/common/mEmbeddedResources.js +++ b/web/common/mEmbeddedResources.js @@ -2,10 +2,10 @@ EmbeddedResources = { "mail.auth.MailServerAuthenticatorNoThread.truststore.jks.b64" : - "your trust store", + "{##TRUSTSTORE_AUTH##}", "mail.client.Mailer.send-truststore.jks.b64" : - "your trust store" + "{##TRUSTSTORE_SEND##}" }; /** resources **/