httpd takes care of /var/log/plcapi.log and permissions

diff --git a/Makefile b/Makefile
index 775df16..0b57cd1 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -16,15 +16,8 @@ ifdef PLC
 SSHURL:=root@$(PLC):/
 SSHCOMMAND:=ssh root@$(PLC)
 else
 SSHURL:=root@$(PLC):/
 SSHCOMMAND:=ssh root@$(PLC)
 else

-ifdef PLCHOSTLXC
-SSHURL:=root@$(PLCHOSTLXC):/var/lib/lxc/$(GUESTNAME)/rootfs
+SSHURL:=root@$(PLCHOSTLXC):/vservers/$(GUESTNAME)/

 SSHCOMMAND:=ssh root@$(PLCHOSTLXC) ssh $(GUESTHOSTNAME)
 SSHCOMMAND:=ssh root@$(PLCHOSTLXC) ssh $(GUESTHOSTNAME)

-else
-ifdef PLCHOSTVS
-SSHURL:=root@$(PLCHOSTVS):/vservers/$(GUESTNAME)
-SSHCOMMAND:=ssh root@$(PLCHOSTVS) vserver $(GUESTNAME) exec
-endif
-endif

 endif
 
 LOCAL_RSYNC_EXCLUDES   := --exclude '*.pyc' 
 endif
 
 LOCAL_RSYNC_EXCLUDES   := --exclude '*.pyc' 


@@ -46,7 +39,7 @@ else
        +$(RSYNC) db-config.d/ $(SSHURL)/etc/planetlab/db-config.d/
        +$(RSYNC) plc_config.py $(SSHURL)/usr/lib\*/python2.\*/site-packages/plc_config.py
        +$(RSYNC) default_config.xml $(SSHURL)/etc/planetlab/default_config.xml
        +$(RSYNC) db-config.d/ $(SSHURL)/etc/planetlab/db-config.d/
        +$(RSYNC) plc_config.py $(SSHURL)/usr/lib\*/python2.\*/site-packages/plc_config.py
        +$(RSYNC) default_config.xml $(SSHURL)/etc/planetlab/default_config.xml

-       @echo XXXXXXXX you might need to run ssh root@$(PLC) service plc start 
+       @echo XXXXXXXX you might need to run $(SSHCOMMAND) service plc start 

 endif
 
 #################### convenience, for debugging only
 endif
 
 #################### convenience, for debugging only

diff --git a/plc.d/httpd b/plc.d/httpd
index 48d340e..9a926f3 100755 (executable)
--- a/plc.d/httpd
+++ b/plc.d/httpd
@@ -286,6 +286,10 @@ EOF
          chmod 666 /var/log/php.log
        fi
 
          chmod 666 /var/log/php.log
        fi
 

+       ## make room for logs
+       touch /var/log/plcapi.log
+       chmod 666 /var/log/plcapi.log
+

        plc_daemon httpd
        check
 
        plc_daemon httpd
        check