Browse code

- 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

Andrei Pelinescu-Onciul authored on 15/03/2006 16:13:46
Showing 2 changed files
... ...
@@ -30,6 +30,7 @@
30 30
 #  2004-09-02  install-man will automatically "fix" the path of the files
31 31
 #               referred in the man pages
32 32
 #  2006-02-14  added utils & install-utils (andrei)
33
+#  2006-03-15  added nodeb parameter for make tar (andrei)
33 34
 #
34 35
 
35 36
 auto_gen=lex.yy.c cfg.tab.c #lexx, yacc etc
... ...
@@ -91,9 +92,9 @@ modules_full_path=$(join  $(modules), $(addprefix /, $(modules_names)))
91 91
 
92 92
 # which utils need compilation (directory path) and which to install
93 93
 # (full path including file name)
94
-utils_compile=	utils/gen_ha1 utils/serunix
94
+utils_compile=	utils/gen_ha1 utils/serunix utils/sercmd
95 95
 utils_install=	utils/gen_ha1/gen_ha1 utils/serunix/serunix \
96
-				scripts/sc scripts/mysql/ser_mysql.sh
96
+				scripts/sc scripts/mysql/ser_mysql.sh utils/sercmd/sercmd
97 97
 
98 98
 
99 99
 ALLDEP=Makefile Makefile.sources Makefile.defs Makefile.rules
... ...
@@ -123,6 +124,8 @@ export PREFIX LOCALBASE
123 123
 #export INSTALL INSTALL-CFG INSTALL-BIN INSTALL-MODULES INSTALL-DOC INSTALL-MAN 
124 124
 #export INSTALL-TOUCH
125 125
 
126
+tar_name=$(NAME)-$(RELEASE)_src
127
+
126 128
 tar_extra_args+=$(addprefix --exclude=$(notdir $(CURDIR))/, \
127 129
 					$(auto_gen) $(auto_gen_others))
128 130
 ifneq ($(TLS),)
... ...
@@ -130,6 +133,11 @@ ifneq ($(TLS),)
130 130
 else
131 131
 	tar_extra_args+=--exclude=$(notdir $(CURDIR))/tls* 
132 132
 endif
133
+
134
+ifneq ($(nodeb),)
135
+	tar_extra_args+=--exclude=$(notdir $(CURDIR))/debian 
136
+	tar_name:=$(tar_name)_nodeb
137
+endif
133 138
 # include the common rules
134 139
 include Makefile.rules
135 140
 
... ...
@@ -214,7 +222,7 @@ tar:
214 214
 			    mv tmp/_tar1/$(notdir $(CURDIR)) \
215 215
 			       tmp/_tar2/"$(NAME)-$(RELEASE)" && \
216 216
 			    (cd tmp/_tar2 && $(TAR) \
217
-			                    -zcf ../../"$(NAME)-$(RELEASE)_src".tar.gz \
217
+			                    -zcf ../../"$(tar_name)".tar.gz \
218 218
 			                               "$(NAME)-$(RELEASE)" ) ; \
219 219
 			    rm -rf tmp/_tar1; rm -rf tmp/_tar2
220 220
 
... ...
@@ -22,7 +22,6 @@ dns=no           # (cmd. line: -r)
22 22
 rev_dns=no      # (cmd. line: -R)
23 23
 #port=5060
24 24
 #children=4
25
-fifo="/tmp/ser_fifo"
26 25
 #user=ser
27 26
 #group=ser
28 27
 #fifo_user=ser # owner of the ser fifo
... ...
@@ -48,6 +47,8 @@ loadmodule "/usr/local/lib/ser/modules/maxfwd.so"
48 48
 loadmodule "/usr/local/lib/ser/modules/usrloc.so"
49 49
 loadmodule "/usr/local/lib/ser/modules/registrar.so"
50 50
 loadmodule "/usr/local/lib/ser/modules/textops.so"
51
+loadmodule "/usr/local/lib/ser/modules/ctl.so"
52
+#loadmodule "/usr/local/lib/ser/modules/fifo.so"
51 53
 
52 54
 # Uncomment this if you want digest authentication
53 55
 # mysql.so must be loaded !
... ...
@@ -78,6 +79,15 @@ modparam("usrloc", "db_mode",   0)
78 78
 # add value to ;lr param to make some broken UAs happy
79 79
 modparam("rr", "enable_full_lr", 1)
80 80
 
81
+# ctl params
82
+# by default ctl listens on unixs:/tmp/ser_ctl if no other address is
83
+# specified in modparams; this is also the default for sercmd
84
+modparam("ctl", "binrpc", "unixs:/tmp/ser_ctl")
85
+# listen on the "standard" fifo for backward compatibility
86
+modparam("ctl", "fifo", "fifo:/tmp/ser_fifo")
87
+# listen on tcp, localhost
88
+#modparam("ctl", "binrpc", "tcp:localhost:2046")
89
+
81 90
 # -------------------------  request routing logic -------------------
82 91
 
83 92
 # main routing logic