more setup

build/compile-all

@@ -1,3 +1,4 @@
 ./compile-java
+./compile-gwt
 ./compile-web
 ./export

deploy/deploy-all

@@ -6,6 +6,6 @@
 ./server-deploy mail-user
 ./server-deploy mail-key
 ./server-deploy tools
-./web-deploy
+./server-deploy web
 
 #./server-deploy tunnel

ext/setup

@@ -1,4 +1,5 @@
 wget http://mirror.sdunix.com/apache/tomcat/tomcat-7/v7.0.42/bin/apache-tomcat-7.0.42.tar.gz
+ln -s apache-tomcat-7.0.42.tar.gz apache-tomcat.tar.gz
 tar -xzf apache-tomcat-7.0.42.tar.gz
 rm apache-tomcat
 ln -fs apache-tomcat-7.0.42 apache-tomcat

gwt/build.xml

@@ -7,8 +7,8 @@
 <project basedir="." default="gwtc" name="Mailiverse-GWT">
     <property environment="env"/>
     <property name="ECLIPSE_HOME" value="../../../Desktop/eclipse"/>
-    <property name="GWT_PLUGIN" value="ls ../ext/gwt"/>
+    <property name="GWT_PLUGIN" value="../ext/gwt"/>
-    <property name="gwt.args" value="-logLevel INFO"/>
+    <property name="gwt.args" value="-logLevel ALL -style PRETTY"/>
     <property name="debuglevel" value="source,lines,vars"/>
     <property name="target" value="1.7"/>
     <property name="source" value="1.7"/>

install/setup-tomcat.remote

@@ -1,6 +1,7 @@
 set -x
 
 tar -xzvf apache-tomcat.tar.gz
+rm tomcat
 ln -s apache-tomcat-* tomcat
 
 ln -s tomcat/logs/catalina.out run.log

setup-1-dependencies-basics

@@ -1,29 +0,0 @@
-pushd ext
-./setup
-popd
-
-pushd java/ext
-./setup-bc
-popd
-
-pushd build
-./compile-java
-popd
-
-pushd passwords
-./make
-popd
-
-pushd keys
-  ./make
-
-  pushd primary
-  ./make-self-signed-key
-  popd
-
-  pushd nginx
-  ./convert-selfsigned
-  popd 
-popd
-
-

setup-2-install

@@ -20,6 +20,9 @@ echo 'Enter the name of your site (example: joesmail.com):'
 read site
 target=mail.$site
 
+echo "Site name will be: $site, the target machine will be $target"
+echo "";
+
 echo 'configuring the hosts files which are used in deploy and compilation'
 pushd config/hosts
 ./make-prod $site
@@ -32,26 +35,29 @@ read rootuser
 echo 'OK, starting:'
 
 echo $rootuser > install/requirements/server_root_account
-(cd install/requirements && ./get_rsa_pub)
+pushd install/requirements
+./get_rsa_pub
+popd
 
 echo "
 I am now going to enable passwordless login on the $target INSTALL computer
-You will need to enter the password"
+You will need to enter the password a few times...
+"
 echo '
 Press <return> to start
-';
+'
-read dummy
+read dummy1
 
-cd install
 
+pushd install
 ./enable-passwordless-login $target
 
 echo '
-Hopefully that went well, if it didn't well, press control-c now
+Hopefully that went well, if it didn-t well, press control-c now
-I'm now going to setup the target machine.
+I am now going to setup the target machine.
 Press <return> to start
-';
+'
-read dummy;
+read dummy2
 
 ./setup-server $target
 
@@ -60,3 +66,6 @@ Hopefully that went well.....
 
 Please run the next setup script
 '
+
+popd
+

setup-4-deploy

@@ -1,2 +1,2 @@
 cd deploy
-./server-deploy-all
+./deploy-all