add freeside-selfservice-server to init script

add domsvc checking as a foreign key

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 9b953ea..e0c4662 100644 (file)
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -673,7 +673,8 @@ sub check {
   }
 
   my $error = $self->ut_numbern('svcnum')
-              || $self->ut_number('domsvc')
+              #|| $self->ut_number('domsvc')
+              || $self->ut_foreign_key('domsvc', 'svc_domain', 'svcnum' )
               || $self->ut_textn('sec_phrase')
   ;
   return $error if $error;

diff --git a/Makefile b/Makefile
index c47720b..da56c73 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -48,6 +48,9 @@ SIGNUP_MACHINE = localhost
 SIGNUP_AGENTNUM = 2
 SIGNUP_REFNUM = 2
 
+SELFSERVICE_USER = nostart
+SELFSERVICE_MACHINE = localhost
+
 #---
 
 #not changable yet

diff --git a/init.d/freeside-init b/init.d/freeside-init
index d3016b2..37ced73 100644 (file)
--- a/init.d/freeside-init
+++ b/init.d/freeside-init
@@ -15,6 +15,9 @@ SIGNUP_MACHINE=%%%SIGNUP_MACHINE%%%
 SIGNUP_AGENTNUM=%%%SIGNUP_AGENTNUM%%%
 SIGNUP_REFNUM=%%%SIGNUP_REFNUM%%%
 
+SELFSERVICE_USER=%%%SELFSERVICE_USER%%%
+SELFSERVICE_MACHINE=%%%SELFSERVICE_MACHINE%%%
+
 case "$1" in
   start)
         # Start daemons.
@@ -29,6 +32,11 @@ case "$1" in
         echo -n "Starting fs_signup_server: "
         su freeside -c "$FREESIDE_PATH/fs_signup/fs_signup_server $SIGNUP_USER $SIGNUP_MACHINE $SIGNUP_AGENTNUM $SIGNUP_REFNUM" &
         echo "done."
+
+        echo -n "Starting freeside-selfservice-server: "
+        $FREESIDE_PATH/fs_selfservice/freeside-selfservice-server $SELFSERVICE_USER $SELFSERVICE_MACHINE
+        echo "done."
+
         ;;
   stop)
         # Stop daemons.
@@ -43,6 +51,10 @@ case "$1" in
         echo -n "Stopping fs_signup_server: "
         killall fs_signup_server
         echo "done."
+
+        echo -n "Stopping freeside-selfservice-server: "
+        kill `cat /var/run/freeside-selfservice-server.pid`
+        echo "done."
         ;;
 
   restart)