Changeset bae014d9f22e13f6115d53d154e6489f20ae00e4

Timestamp:

06/09/09 10:07:55 (3 years ago)

Author:

Neutron Soutmun <neo.neutron@…>

Children:

7751a641e2a294d986b002dd01264b7d068258a2

Parents:

927d0c70c763dcf56e6f12ebe02a51688468a5c3

git-committer:

Neutron Soutmun <neo.neutron@…> (06/09/09 10:07:55)

Message:

Adjust build system config and install files

• Adjust build system config to install the files to appropriate paths.
• The MAINTAINERCLEANFILES was added.
• Now rahunas.db installed into the default directory /var/lib/rahunas.
• RahuNAS daemon executable file (rahunasd) now installed into /usr/sbin.
• Tool scripts now installed into the /usr/sbin and their names change to satisfy the debian policy.

Files:

• Makefile.am (modified) (1 diff)
• configure.ac (modified) (1 diff)
• data/Makefile.am (modified) (1 diff)
• example/rahunas.init.in (modified) (1 diff)
• lcfg/Makefile.am (modified) (1 diff)
• src/Makefile.am (modified) (1 diff)
• src/include/linux/netfilter_ipv4/Makefile.am (deleted)
• src/rh-task-bandwidth.c (modified) (6 diffs)
• src/rh-task-dbset.c (modified) (1 diff)
• src/rh-task-iptables.c (modified) (4 diffs)
• tools/Makefile.am (added)
• tools/rahunas-bandwidth.in (moved) (moved from tools/bandwidth.sh.in)
• tools/rahunas-firewall.in (moved) (moved from tools/firewall.sh.in)
• tools/rahunas-weblogin-config-update.in (moved) (moved from tools/weblogin-config-update.sh.in) (1 diff)
• xmlrpc/Makefile.am (modified) (1 diff)

Makefile.am

@@ -1 +1 @@
 EXTRA_DIST = weblogin
-SUBDIRS = xmlrpc lcfg src data
+SUBDIRS = xmlrpc lcfg src data tools example

configure.ac

@@ -54 +54 @@
 AC_CHECK_FUNCS([dup2])
 AC_CONFIG_FILES([
-        Makefile
-        xmlrpc/Makefile
+  Makefile
+  xmlrpc/Makefile
   lcfg/Makefile
-        src/Makefile
-        data/Makefile
-  src/include/linux/netfilter_ipv4/Makefile
-  tools/firewall.sh
-  tools/bandwidth.sh
-        tools/weblogin-config-update.sh
+  src/Makefile
+  data/Makefile
+  tools/Makefile
+  tools/rahunas-firewall
+  tools/rahunas-bandwidth
+  tools/rahunas-weblogin-config-update
+  example/Makefile
   example/rahunas.default
   example/rahunas.init

data/Makefile.am

@@ -1 +1 @@
 # Rahunas configuration and database file
-configdir = $(sysconfdir)/rahunas
-config_DATA = rahunas.db
+MAINTAINERCLEANFILES = Makefile.in
 
-EXTRA_DIST = $(config_DATA)
+databasedir = $(localstatedir)/lib/rahunas
+database_DATA = rahunas.db
+
+EXTRA_DIST = $(database_DATA)

example/rahunas.init.in

@@ -17 +17 @@
 exec_prefix=@exec_prefix@
 
-DAEMON=@bindir@/rahunasd
+DAEMON=@sbindir@/rahunasd
 INIT=@sysconfdir@/default/rahunas
-FIREWALL=@sysconfdir@/rahunas/firewall.sh
-WEBLOGIN_CONFIG=@sysconfdir@/rahunas/weblogin-config-update.sh
+FIREWALL=@sbindir@/rahunas-firewall
+WEBLOGIN_CONFIG=@sbindir@/rahunas-weblogin-config-update
 NAME=rahunasd
 DESC="Rahu Network Access Server"

lcfg/Makefile.am

@@ +1 @@
+MAINTAINERCLEANFILES = Makefile.in
+
 noinst_LIBRARIES = liblcfg.a
-
 liblcfg_a_SOURCES = lcfg_static.c lcfg_static.h 

src/Makefile.am

@@ -1 @@
-SUBDIRS = include/linux/netfilter_ipv4
+MAINTAINERCLEANFILES = Makefile.in
 
-bin_PROGRAMS = rahunasd
+sbin_PROGRAMS = rahunasd
 
 IPSET_VERSION:=2.3.3
 
 AM_CFLAGS = \
-        $(LIBGNET_CFLAGS) \
-        $(LIBGDA_CFLAGS) \
-        -I$(top_builddir)/src/include/ \
-        -DRAHUNAS_VERSION=\"$(RAHUNAS_VERSION)\" \
-        -DPROGRAM=\"$(PROGRAM)\" \
-        -DIPSET_VERSION=\"$(IPSET_VERSION)\" \
-        -DRAHUNAS_CONF_DIR=\"$(sysconfdir)/rahunas/\" \
+  $(LIBGNET_CFLAGS) \
+  $(LIBGDA_CFLAGS) \
+  -I$(top_builddir)/src/include/ \
+  -DRAHUNAS_VERSION=\"$(RAHUNAS_VERSION)\" \
+  -DPROGRAM=\"$(PROGRAM)\" \
+  -DIPSET_VERSION=\"$(IPSET_VERSION)\" \
+  -DRAHUNAS_CONF_DIR=\"$(sysconfdir)/rahunas/\" \
+  -DRAHUNAS_DB_DIR=\"$(localstatedir)/lib/rahunas/\" \
   -DRAHUNAS_LOG_DIR=\"$(localstatedir)/log/rahunas/\" \
-  -DRAHUNAS_RUN_DIR=\"$(localstatedir)/run/\"
+  -DRAHUNAS_RUN_DIR=\"$(localstatedir)/run/\" \
+  -DRAHUNAS_FIREWALL_WRAPPER=\"$(sbindir)/rahunas-firewall\" \
+  -DRAHUNAS_BANDWIDTH_WRAPPER=\"$(sbindir)/rahunas-bandwidth\"
 
 rahunasd_SOURCES = \
-        rahunasd.c \
-        rahunasd.h \
-        rh-server.c \
-        rh-server.h \
-        rh-xmlrpc-server.c \
-        rh-xmlrpc-server.h \
-        rh-xmlrpc-cmd.c \
-        rh-xmlrpc-cmd.h \
+  rahunasd.c \
+  rahunasd.h \
+  rh-server.c \
+  rh-server.h \
+  rh-xmlrpc-server.c \
+  rh-xmlrpc-server.h \
+  rh-xmlrpc-cmd.c \
+  rh-xmlrpc-cmd.h \
   rh-ipset.c \
-        rh-ipset.h \
-        rh-utils.c \
-        rh-utils.h \
-        rh-task.c \
-        rh-task.h \
-        rh-task-iptables.c \
-        rh-task-iptables.h \
-        rh-task-memset.c \
-        rh-task-memset.h \
-        rh-task-ipset.c \
-        rh-task-ipset.h \
-        rh-task-dbset.c \
-        rh-task-dbset.h \
+  rh-ipset.h \
+  rh-utils.c \
+  rh-utils.h \
+  rh-task.c \
+  rh-task.h \
+  rh-task-iptables.c \
+  rh-task-iptables.h \
+  rh-task-memset.c \
+  rh-task-memset.h \
+  rh-task-ipset.c \
+  rh-task-ipset.h \
+  rh-task-dbset.c \
+  rh-task-dbset.h \
   rh-task-bandwidth.c \
   rh-task-bandwidth.h \
   rh-radius.h \
   rh-config.c \
-        rh-config.h
+  rh-config.h
 
 rahunasd_LDADD =  \
-        $(top_builddir)/xmlrpc/libgnetxmlrpc.a \
+  $(top_builddir)/xmlrpc/libgnetxmlrpc.a \
   $(top_builddir)/lcfg/liblcfg.a \
-        $(LIBGNET_LIBS) \
-        $(LIBGDA_LIBS)
+  $(LIBGNET_LIBS) \
+  $(LIBGDA_LIBS)
+
+noinst_HEADERS = \
+  include/linux/netfilter_ipv4/ip_set.h \
+  include/linux/netfilter_ipv4/ip_set_rahunas.h
+

src/rh-task-bandwidth.c

@@ -18 +18 @@
 #include "rh-task-memset.h"
 #include "rh-utils.h"
-
-#define BANDWIDTH_WRAPPER "/etc/rahunas/bandwidth.sh"
 
 static unsigned short slot_flags[MAX_SLOT_PAGE] = {1};
@@ -93 +91 @@
   if (pid == 0) {
     // Child
-    execv(BANDWIDTH_WRAPPER, args);
+    execv(RAHUNAS_BANDWIDTH_WRAPPER, args);
   } else if (pid < 0) {
     // Fork error
@@ -142 +140 @@
   DP("Bandwidth: start");
 
-  args[0] = BANDWIDTH_WRAPPER;
+  args[0] = RAHUNAS_BANDWIDTH_WRAPPER;
   args[1] = "start";
   args[2] = iface->dev_internal;
@@ -160 +158 @@
   DP("Bandwidth: stop");
 
-  args[0] = BANDWIDTH_WRAPPER;
+  args[0] = RAHUNAS_BANDWIDTH_WRAPPER;
   args[1] = "stop";
   args[2] = iface->dev_internal;
@@ -178 +176 @@
      bw_req->ip, bw_req->bandwidth_max_down, bw_req->bandwidth_max_up);
 
-  args[0] = BANDWIDTH_WRAPPER;
+  args[0] = RAHUNAS_BANDWIDTH_WRAPPER;
   args[1] = "add";
   args[2] = bw_req->slot_id;
@@ -198 +196 @@
   DP("Bandwidth: request %s", bw_req->slot_id);
 
-  args[0] = BANDWIDTH_WRAPPER;
+  args[0] = RAHUNAS_BANDWIDTH_WRAPPER;
   args[1] = "del";
   args[2] = bw_req->slot_id;

src/rh-task-dbset.c

@@ -250 +250 @@
   char ds_name[] = PROGRAM;
   char ds_provider[] = "SQLite";
-  char ds_cnc_string[] = "DB_DIR=" RAHUNAS_CONF_DIR ";DB_NAME=" DB_NAME; 
+  char ds_cnc_string[] = "DB_DIR=" RAHUNAS_DB_DIR ";DB_NAME=" DB_NAME; 
   char ds_desc[] = "RahuNAS DB Set";
 

src/rh-task-iptables.c

@@ -16 +16 @@
 #include "rh-task.h"
 #include "rh-utils.h"
-
-#define IPTABLES_WRAPPER "/etc/rahunas/firewall.sh"
 
 int iptables_exec(struct vserver *vs, char *const args[])
@@ -78 +76 @@
   if (pid == 0) {
     // Child
-    execve(IPTABLES_WRAPPER, args, env);
+    execve(RAHUNAS_FIREWALL_WRAPPER, args, env);
   } else if (pid < 0) {
     // Fork error
@@ -113 +111 @@
   DP("IPTables: start");
 
-  args[0] = IPTABLES_WRAPPER;
+  args[0] = RAHUNAS_FIREWALL_WRAPPER;
   args[1] = "start-config";
   args[2] = (char *) 0;
@@ -126 +124 @@
   DP("IPTables: stop");
 
-  args[0] = IPTABLES_WRAPPER;
+  args[0] = RAHUNAS_FIREWALL_WRAPPER;
   args[1] = "stop-config";
   args[2] = (char *) 0;

tools/rahunas-weblogin-config-update.in

@@ -23 +23 @@
 
 # DB
-RAHUNAS_DB=/etc/rahunas/rahunas.db
+RAHUNAS_DB=@localstatedir@/lib/rahunas/rahunas.db
 SQLITE3=/usr/bin/sqlite3
 

xmlrpc/Makefile.am

@@ -2 +2 @@
 
 @SET_MAKE@
+
+MAINTAINERCLEANFILES = Makefile.in
 
 noinst_LIBRARIES = libgnetxmlrpc.a