diff --git a/deploy/web/setup b/deploy/web/setup index c8bb487..a0e2e6f 100755 --- 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/ diff --git a/install/requirements/server_root_account b/install/requirements/server_root_account index d8649da..e9e5f7c 100644 --- a/install/requirements/server_root_account +++ b/install/requirements/server_root_account @@ -1 +1 @@ -root +ubuntu diff --git a/install/setup-server b/install/setup-server index 146bb6e..68dfee2 100755 --- 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) diff --git a/install/setup-web b/install/setup-web index d9912a5..2681da8 100755 --- 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 diff --git a/install/setup-web.remote b/install/setup-web.remote index 3f7b658..ba0da67 100755 --- 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