Permalink
Browse files

removed all of the apache reloading code because sudo is required and…

… PHD shouldn't handle this unless it configures the server to be able to reload apache without sudo (via phd_server_setup). for now, you need to reload yourself.
  • Loading branch information...
1 parent 0f9d6d6 commit 303ae48d560c42931b182bfb624bad725b537e06 @remi committed Jan 3, 2010
Showing with 2 additions and 9 deletions.
  1. +2 −8 phd
  2. +0 −1 phd_server_setup
View
10 phd
@@ -8,7 +8,6 @@
PHD_APACHE_VIRTUALHOSTS='/etc/apache2/phd-sites'
PHD_APACHE_CONFIG='/etc/apache2/apache2.conf'
PHD_APACHE_INCLUDE="Include $PHD_APACHE_VIRTUALHOSTS"
-PHD_APACHE_RELOAD='/etc/init.d/apache2 reload'
PHD_APACHE_VIRTUALHOST_TEXT='<VirtualHost *:80>
ServerName $host
DocumentRoot $dir/public
@@ -44,12 +43,7 @@ if [[ -f "$dir/config.ru" ]]; then
echo 'Not yet configured'
PHD_APACHE_VIRTUALHOST_TEXT="echo \"$PHD_APACHE_VIRTUALHOST_TEXT\""
eval "$PHD_APACHE_VIRTUALHOST_TEXT" > $PHD_APACHE_VIRTUALHOSTS/$host
- echo 'Application should be configured'
- output=`eval $PHD_APACHE_RELOAD 2>&1`
- if [[ ! -z "echo $output | grep 'Permission denied'" ]]; then
- echo "Couldn't reload apache - permission denied"
- else
- echo 'Apache reloaded'
- fi
+ echo 'Application should now be configured'
+ echo 'You will need to reload apache for the application to work'
fi
fi
View
@@ -4,7 +4,6 @@
PHD_APACHE_VIRTUALHOSTS='/etc/apache2/phd-sites'
PHD_APACHE_CONFIG='/etc/apache2/apache2.conf'
PHD_APACHE_INCLUDE="Include $PHD_APACHE_VIRTUALHOSTS"
-PHD_APACHE_RELOAD='/etc/init.d/apache2 reload'
PUSHAND_INSTALL_DIR=~/tmp
# read .phdrc (for overrides)

0 comments on commit 303ae48

Please sign in to comment.