- Makefile: added nodeb: make tar nodeb=1 (the tar.gz won't contain

 the debian subdir anymore, needed for debian packaging)
- updated ser.cfg: removed old fifo and added it via ctl

Makefile

@@ -30,6 +30,7 @@
 #  2004-09-02  install-man will automatically "fix" the path of the files
 #               referred in the man pages
 #  2006-02-14  added utils & install-utils (andrei)
+#  2006-03-15  added nodeb parameter for make tar (andrei)
 #
 
 auto_gen=lex.yy.c cfg.tab.c #lexx, yacc etc
@@ -91,9 +92,9 @@ modules_full_path=$(join  $(modules), $(addprefix /, $(modules_names)))
 
 # which utils need compilation (directory path) and which to install
 # (full path including file name)
-utils_compile=	utils/gen_ha1 utils/serunix
+utils_compile=	utils/gen_ha1 utils/serunix utils/sercmd
 utils_install=	utils/gen_ha1/gen_ha1 utils/serunix/serunix \
-				scripts/sc scripts/mysql/ser_mysql.sh
+				scripts/sc scripts/mysql/ser_mysql.sh utils/sercmd/sercmd
 
 
 ALLDEP=Makefile Makefile.sources Makefile.defs Makefile.rules
@@ -123,6 +124,8 @@ export PREFIX LOCALBASE
 #export INSTALL INSTALL-CFG INSTALL-BIN INSTALL-MODULES INSTALL-DOC INSTALL-MAN 
 #export INSTALL-TOUCH
 
+tar_name=$(NAME)-$(RELEASE)_src
+
 tar_extra_args+=$(addprefix --exclude=$(notdir $(CURDIR))/, \
 					$(auto_gen) $(auto_gen_others))
 ifneq ($(TLS),)
@@ -130,6 +133,11 @@ ifneq ($(TLS),)
 else
 	tar_extra_args+=--exclude=$(notdir $(CURDIR))/tls* 
 endif
+
+ifneq ($(nodeb),)
+	tar_extra_args+=--exclude=$(notdir $(CURDIR))/debian 
+	tar_name:=$(tar_name)_nodeb
+endif
 # include the common rules
 include Makefile.rules
 
@@ -214,7 +222,7 @@ tar:
 			    mv tmp/_tar1/$(notdir $(CURDIR)) \
 			       tmp/_tar2/"$(NAME)-$(RELEASE)" && \
 			    (cd tmp/_tar2 && $(TAR) \
-			                    -zcf ../../"$(NAME)-$(RELEASE)_src".tar.gz \
+			                    -zcf ../../"$(tar_name)".tar.gz \
 			                               "$(NAME)-$(RELEASE)" ) ; \
 			    rm -rf tmp/_tar1; rm -rf tmp/_tar2
 

etc/ser.cfg

@@ -22,7 +22,6 @@ dns=no           # (cmd. line: -r)
 rev_dns=no      # (cmd. line: -R)
 #port=5060
 #children=4
-fifo="/tmp/ser_fifo"
 #user=ser
 #group=ser
 #fifo_user=ser # owner of the ser fifo
@@ -48,6 +47,8 @@ loadmodule "/usr/local/lib/ser/modules/maxfwd.so"
 loadmodule "/usr/local/lib/ser/modules/usrloc.so"
 loadmodule "/usr/local/lib/ser/modules/registrar.so"
 loadmodule "/usr/local/lib/ser/modules/textops.so"
+loadmodule "/usr/local/lib/ser/modules/ctl.so"
+#loadmodule "/usr/local/lib/ser/modules/fifo.so"
 
 # Uncomment this if you want digest authentication
 # mysql.so must be loaded !
@@ -78,6 +79,15 @@ modparam("usrloc", "db_mode",   0)
 # add value to ;lr param to make some broken UAs happy
 modparam("rr", "enable_full_lr", 1)
 
+# ctl params
+# by default ctl listens on unixs:/tmp/ser_ctl if no other address is
+# specified in modparams; this is also the default for sercmd
+modparam("ctl", "binrpc", "unixs:/tmp/ser_ctl")
+# listen on the "standard" fifo for backward compatibility
+modparam("ctl", "fifo", "fifo:/tmp/ser_fifo")
+# listen on tcp, localhost
+#modparam("ctl", "binrpc", "tcp:localhost:2046")
+
 # -------------------------  request routing logic -------------------
 
 # main routing logic