fixes for web setup on ubuntu

2013-09-01 18:48:43 -04:00 · 2013-09-01 18:48:43 -04:00 · 1ae87ecb84
parent 993aaf9119
commit 1ae87ecb84
5 changed files with 6 additions and 5 deletions
--- a/deploy/web/setup
+++ b/deploy/web/setup
@ -1,6 +1,5 @@
 cd ~
 ln -fs deploy/www
 ln -fs deploy/resources
-ln -fs /var/log/nginx/error.log run.log

 rsync -avz --delete www/ /var/local/www/
--- a/install/requirements/server_root_account
+++ b/install/requirements/server_root_account
@ -1 +1 @@
-root
+ubuntu
--- a/install/setup-server
+++ b/install/setup-server
@ -10,4 +10,6 @@ M_HOST=$1
 ./setup-mysql $M_HOST
 ./setup-tomcat $M_HOST
 ./setup-web $M_HOST
-./enable-rsync $M_HOST
+
+echo You may need to run: ./enable-rsync $M_HOST
+echo If your debian is super minimal (no rsync)
--- a/install/setup-web
+++ b/install/setup-web
@ -5,4 +5,4 @@ M_HOST=$1

 scp sudoers.d-web $M_ROOT@$M_HOST:
 scp setup-web.remote $M_ROOT@$M_HOST:
-ssh $M_ROOT@$M_HOST ./setup-web.remote
+ssh $M_ROOT@$M_HOST sudo ./setup-web.remote
--- a/install/setup-web.remote
+++ b/install/setup-web.remote
@ -1,6 +1,6 @@
 set -x

-sudo apt-get install nginx --yes
+apt-get install nginx --yes
 cp sudoers.d-web /etc/sudoers.d/web
 chmod 0440 /etc/sudoers.d/web