not allowing the code to be run as root

git-svn-id: svn://svn.open-ils.org/ILS/trunk@1921 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Open-ILS/src/Makefile b/Open-ILS/src/Makefile
index 8b8a730..7fbb337 100644 (file)
--- a/Open-ILS/src/Makefile
+++ b/Open-ILS/src/Makefile
@@ -38,9 +38,8 @@ mod_xmltools-install:
 webcore-install:
        @echo $@
        echo "Copying web into $(WEBDIR)"
-       # XXX put these back
-       #mkdir -p $(WEBDIR)
-       #cp -r ../web/* $(WEBDIR)
+       mkdir -p $(WEBDIR)
+       cp -r ../web/* $(WEBDIR)
 
 libfieldmapper:        
        make -C apachemods libfieldmapper.so

diff --git a/OpenSRF/bin/opensrf_all b/OpenSRF/bin/opensrf_all
index a8e7fce..3d4ec42 100755 (executable)
--- a/OpenSRF/bin/opensrf_all
+++ b/OpenSRF/bin/opensrf_all
@@ -99,6 +99,8 @@ function startOpenSRF {
 
 function makeMeGo {
        
+       i=$(whoami) && [ "$i" == "root" ] && echo "Cannot run as root.  Exiting..." && exit;
+       
        if [ ! -z "$JSERVER" ]; then
                echo "Starting Chop Chop, Jabber (jserver-c)...";
                startJserver;

diff --git a/OpenSRF/bin/opensrf_ctl b/OpenSRF/bin/opensrf_ctl
index 65b7fd5..e3578d7 100755 (executable)
--- a/OpenSRF/bin/opensrf_ctl
+++ b/OpenSRF/bin/opensrf_ctl
@@ -12,6 +12,8 @@ function usage {
 
 function startSystem {
 
+       i=$(whoami) && [ "$i" == "root" ] && echo "Cannot run as root.  Exiting..." && exit;
+
        case $1 in 
        
                "start")

diff --git a/install.sh b/install.sh
index a057363..5a34a64 100755 (executable)
--- a/install.sh
+++ b/install.sh
@@ -75,7 +75,13 @@ function mkInstallDirs {
                fi
        fi
 
-       
+
+       # add the opensrf user and group
+        if [ ! $(grep "^opensrf:" /etc/group) ]; then groupadd opensrf; fi
+        if [ ! $(grep "^opensrf:" /etc/passwd) ]; then useradd opensrf; fi
+
+        # add opensrf to the opensrf group
+        gpasswd -a opensrf opensrf
 
 }
 
@@ -217,6 +223,10 @@ function runInstall {
                esac
 
        done
+
+       if installing; then
+               echo -e "\nNow run: chown -R opensrf:opensrf $PREFIX"
+       fi
 }