moved stuff from gwt/war to web/WebContent where it should have been all along, probably

This commit is contained in:
Timothy Prepscius 2013-09-02 13:20:30 -04:00
parent d4a25864a0
commit 56da6feef2
1102 changed files with 21 additions and 3 deletions

2
build/.gitignore vendored Normal file
View File

@ -0,0 +1,2 @@
www-dev/
www-prod/

View File

@ -2,6 +2,9 @@
V=`date "+%Y%m%d_%H%M%S"` V=`date "+%Y%m%d_%H%M%S"`
rsync -avL --delete ../web/WebContent/ www-prod/
rsync -avL --delete ../gwt/war/mailiverse_gwt www-prod/mailiverse_gwt
./compile-web-html $V prod ./compile-web-html $V prod
./compile-web-js $V prod ./compile-web-js $V prod

View File

@ -1,4 +1,5 @@
#!/bin/bash #!/bin/bash
set -x
V=$1 V=$1
M=$2 M=$2
@ -8,9 +9,9 @@ HOST_PRIMARY=`cat ../deploy/config/hosts/$M`
HOST_AUTH=`cat ../deploy/config/hosts/auth_$M` HOST_AUTH=`cat ../deploy/config/hosts/auth_$M`
HOST_TOMCAT=`cat ../deploy/config/hosts/tomcat_$M` HOST_TOMCAT=`cat ../deploy/config/hosts/tomcat_$M`
HOST_WEB=`cat ../deploy/config/hosts/web_$M` HOST_WEB=`cat ../deploy/config/hosts/web_$M`
`
dst=../gwt/war
dst=www-$2
cmn_src=../web/common cmn_src=../web/common
client_src=../web/client client_src=../web/client
signup_src=../web/signup signup_src=../web/signup

View File

@ -2,7 +2,7 @@
V=$1 V=$1
M=$2 M=$2
dst=../gwt/war dst=www-$M
function replaceStrings() { function replaceStrings() {
sed -i '' -f replace_js_$M.sed $1 sed -i '' -f replace_js_$M.sed $1

View File

@ -2,6 +2,8 @@
V=`date "+%Y%m%d_%H%M%S"` V=`date "+%Y%m%d_%H%M%S"`
rsync -avL --exclude="WEB-INF" --delete ../gwt/war/ www-dev/
./compile-web-html $V dev ./compile-web-html $V dev
./compile-web-js $V dev ./compile-web-js $V dev

View File

@ -12,6 +12,15 @@
ssl_ciphers HIGH:!aNULL:!MD5; ssl_ciphers HIGH:!aNULL:!MD5;
ssl_prefer_server_ciphers on; ssl_prefer_server_ciphers on;
location /Mailiverse/ {
proxy_pass http://127.0.0.1:8080; # my existing apache instance
proxy_set_header Host $host;
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection upgrade;
}
location / { location / {
autoindex off; autoindex off;
root /var/local/www/; root /var/local/www/;

View File

@ -44,6 +44,7 @@ public class ConstantsServer
public static final String MAIL_AUTH_HOST = KEY_SERVER; public static final String MAIL_AUTH_HOST = KEY_SERVER;
public static final int MAIL_AUTH_PORT = 7001; public static final int MAIL_AUTH_PORT = 7001;
public static final int MAXIMUM_MAIL_SIZE = 1024 * 1024 * 1; public static final int MAXIMUM_MAIL_SIZE = 1024 * 1024 * 1;
public static final int AUTH_TIMEOUT = 45; public static final int AUTH_TIMEOUT = 45;

Some files were not shown because too many files have changed in this diff Show More