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

build/.gitignore

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

build/compile-web

@@ -2,6 +2,9 @@
 
 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-js $V prod
 

build/compile-web-html

@@ -1,4 +1,5 @@
 #!/bin/bash
+set -x
 
 V=$1
 M=$2
@@ -8,9 +9,9 @@ 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
+
+dst=www-$2
 cmn_src=../web/common
 client_src=../web/client
 signup_src=../web/signup

build/compile-web-js

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

build/dev-compile-web

@@ -2,6 +2,8 @@
 
 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-js $V dev
 

deploy/web/resources/nginx.conf

@@ -12,6 +12,15 @@
         ssl_ciphers  HIGH:!aNULL:!MD5;
         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 / {
 	    autoindex off;
 	    root   /var/local/www/;

java/core/src/core/constants/ConstantsServer.java

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