From: Peter Popovec Date: Mon, 22 Sep 2008 07:26:44 +0000 (+0200) Subject: Fixed cron script, removed obsollete debian fiels, moved config to etc. X-Git-Tag: fwcnt-0.7~1 X-Git-Url: http://zub.fei.tuke.sk/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=78f2e9cf8bc5be39ef97f5e62da0e9696b2b2e67;p=fwcnt.backup Fixed cron script, removed obsollete debian fiels, moved config to etc. --- diff --git a/FWcnt2rrd b/FWcnt2rrd index 88ea534..eac2ed3 100755 --- a/FWcnt2rrd +++ b/FWcnt2rrd @@ -145,7 +145,7 @@ awk 'BEGIN{ close(C) } } -}' /var/lib/FWcnt/etc/config +}' /etc/fwcnt.conf #update ipfm like log -grep -q NOIPFM /var/lib/FWcnt/etc/config || /usr/lib/FWcnt/ipfm_FWcnt +grep -q NOIPFM /etc/fwcnt.conf || /usr/lib/FWcnt/ipfm_FWcnt diff --git a/Makefile b/Makefile index 3d9dc22..0a19c8a 100644 --- a/Makefile +++ b/Makefile @@ -20,7 +20,6 @@ install: touch $(DESTDIR)/var/lib/FWcnt/FW_rrd_database/.placeholder install -d $(DESTDIR)/var/lib/FWcnt/run_conf touch $(DESTDIR)/var/lib/FWcnt/run_conf/.placeholder - touch $(DESTDIR)/var/lib/FWcnt/etc/config install -m 755 mrtg-rrd.wrapper.cgi $(DESTDIR)/usr/lib/cgi-bin/mrtg-rrd.wrapper.cgi install -d $(DESTDIR)/var/log/fwcnt touch $(DESTDIR)/var/log/.placeholder diff --git a/README b/README index d196de5..7b8a9cf 100644 --- a/README +++ b/README @@ -60,8 +60,7 @@ for updating firewall counters chains and mrtg system configs check http://YOUR_WEB/cgi-bin/mrtg-rrd.wrapper.cgi non debian users: -1. copy this sample in /var/lib/FWcnt/etc/config (replace 192.168.0.0 with your -IP) +1. copy this sample in /etc/fwcnt.conf (replace 192.168.0.0 with your IP) ---------------- cut ---------------- cntLINK eth0 cntNET 192.168.0.0 diff --git a/clean_FWcnt b/clean_FWcnt index 3e7ff7a..b60adb6 100755 --- a/clean_FWcnt +++ b/clean_FWcnt @@ -1,10 +1,10 @@ #!/bin/bash -if [ ! -f /var/lib/FWcnt/etc/config ]; then +if [ ! -f /etc/fwcnt.conf ]; then exit 0 fi iptables-save |gawk -v F=$1 'BEGIN{ - while(getline <"/var/lib/FWcnt/etc/config"){ + while(getline <"/etc/fwcnt.conf"){ if($1 ~ "^cntNET") { split($2,IP,".") Nx=sprintf("%02X%02X%02X",IP[1],IP[2],IP[3]) diff --git a/cron.d b/cron.d deleted file mode 100644 index e0aaab7..0000000 --- a/cron.d +++ /dev/null @@ -1 +0,0 @@ -0-55/5 * * * * root if [ -x /usr/lib/FWcnt/FWcnt2rrd ]; then (env LANG=C /sbin/iptables-save -c |su --shell=/bin/bash -c '(cd /var/lib/FWcnt/FW_rrd_database/;/usr/lib/FWcnt/FWcnt2rrd)' FWcnt );fi diff --git a/cron.d b/cron.d new file mode 120000 index 0000000..8c4b0a5 --- /dev/null +++ b/cron.d @@ -0,0 +1 @@ +debian/cron.d \ No newline at end of file diff --git a/debian/changelog b/debian/changelog index 0028e94..d4d8a0f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +fwcnt (0.7) unstable; urgency=low + + * Fixed cron script + * removed unused debian .ex files + * config file moved to etc + + -- Peter Popovec Mon, 22 Sep 2008 09:20:37 +0200 + fwcnt (0.6.1) unstable; urgency=low * ipfm log generated by rrdgraph diff --git a/debian/control b/debian/control index 61e86f9..b4dba8c 100644 --- a/debian/control +++ b/debian/control @@ -1,14 +1,14 @@ Source: fwcnt -Section: unknown +Section: local Priority: extra Maintainer: Peter Popovec Build-Depends: debhelper (>= 5) -Standards-Version: 3.7.2 +Standards-Version: 3.8.0 Package: fwcnt Architecture: all Pre-Depends: mrtg-rrd, patch -Depends: gawk, mawk, iptables, cron, rrdtool +Depends: adduser, gawk, mawk, iptables, cron, rrdtool Description: Firewall counter Detailed measuring system for wide range of IPs based on firewall rules (counters) and mrtg with rrd backend database. diff --git a/debian/copyright b/debian/copyright index 3c4a72e..949aa36 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,10 +1,11 @@ -This is fwcnt, written and maintained by root +This is fwcnt, written and maintained by Peter Popovec on Thu, 22 Feb 2007 14:34:16 +0100. The original source can always be found at: - ftp://ftp.debian.org/dists/unstable/main/source/ + http://zub.fei.tuke.sk/local.packages -Copyright Holder: root +Copyright Holder: popovec@fei.tuke.sk +Copyright, 2006,2007,2008 Peter Popovec License: diff --git a/debian/cron.d b/debian/cron.d deleted file mode 120000 index bed16c3..0000000 --- a/debian/cron.d +++ /dev/null @@ -1 +0,0 @@ -../cron.d \ No newline at end of file diff --git a/debian/cron.d b/debian/cron.d new file mode 100644 index 0000000..e0aaab7 --- /dev/null +++ b/debian/cron.d @@ -0,0 +1 @@ +0-55/5 * * * * root if [ -x /usr/lib/FWcnt/FWcnt2rrd ]; then (env LANG=C /sbin/iptables-save -c |su --shell=/bin/bash -c '(cd /var/lib/FWcnt/FW_rrd_database/;/usr/lib/FWcnt/FWcnt2rrd)' FWcnt );fi diff --git a/debian/emacsen-install.ex b/debian/emacsen-install.ex deleted file mode 100644 index 9b73fc8..0000000 --- a/debian/emacsen-install.ex +++ /dev/null @@ -1,45 +0,0 @@ -#! /bin/sh -e -# /usr/lib/emacsen-common/packages/install/fwcnt - -# Written by Jim Van Zandt , borrowing heavily -# from the install scripts for gettext by Santiago Vila -# and octave by Dirk Eddelbuettel . - -FLAVOR=$1 -PACKAGE=fwcnt - -if [ ${FLAVOR} = emacs ]; then exit 0; fi - -echo install/${PACKAGE}: Handling install for emacsen flavor ${FLAVOR} - -#FLAVORTEST=`echo $FLAVOR | cut -c-6` -#if [ ${FLAVORTEST} = xemacs ] ; then -# SITEFLAG="-no-site-file" -#else -# SITEFLAG="--no-site-file" -#fi -FLAGS="${SITEFLAG} -q -batch -l path.el -f batch-byte-compile" - -ELDIR=/usr/share/emacs/site-lisp/${PACKAGE} -ELCDIR=/usr/share/${FLAVOR}/site-lisp/${PACKAGE} - -# Install-info-altdir does not actually exist. -# Maybe somebody will write it. -if test -x /usr/sbin/install-info-altdir; then - echo install/${PACKAGE}: install Info links for ${FLAVOR} - install-info-altdir --quiet --section "" "" --dirname=${FLAVOR} /usr/info/${PACKAGE}.info.gz -fi - -install -m 755 -d ${ELCDIR} -cd ${ELDIR} -FILES=`echo *.el` -cp ${FILES} ${ELCDIR} -cd ${ELCDIR} - -cat << EOF > path.el -(setq load-path (cons "." load-path) byte-compile-warnings nil) -EOF -${FLAVOR} ${FLAGS} ${FILES} -rm -f *.el path.el - -exit 0 diff --git a/debian/emacsen-remove.ex b/debian/emacsen-remove.ex deleted file mode 100644 index b67d233..0000000 --- a/debian/emacsen-remove.ex +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh -e -# /usr/lib/emacsen-common/packages/remove/fwcnt - -FLAVOR=$1 -PACKAGE=fwcnt - -if [ ${FLAVOR} != emacs ]; then - if test -x /usr/sbin/install-info-altdir; then - echo remove/${PACKAGE}: removing Info links for ${FLAVOR} - install-info-altdir --quiet --remove --dirname=${FLAVOR} /usr/info/fwcnt.info.gz - fi - - echo remove/${PACKAGE}: purging byte-compiled files for ${FLAVOR} - rm -rf /usr/share/${FLAVOR}/site-lisp/${PACKAGE} -fi diff --git a/debian/emacsen-startup.ex b/debian/emacsen-startup.ex deleted file mode 100644 index 9b6a164..0000000 --- a/debian/emacsen-startup.ex +++ /dev/null @@ -1,25 +0,0 @@ -;; -*-emacs-lisp-*- -;; -;; Emacs startup file, e.g. /etc/emacs/site-start.d/50fwcnt.el -;; for the Debian fwcnt package -;; -;; Originally contributed by Nils Naumann -;; Modified by Dirk Eddelbuettel -;; Adapted for dh-make by Jim Van Zandt - -;; The fwcnt package follows the Debian/GNU Linux 'emacsen' policy and -;; byte-compiles its elisp files for each 'emacs flavor' (emacs19, -;; xemacs19, emacs20, xemacs20...). The compiled code is then -;; installed in a subdirectory of the respective site-lisp directory. -;; We have to add this to the load-path: -(let ((package-dir (concat "/usr/share/" - (symbol-name flavor) - "/site-lisp/fwcnt"))) -;; If package-dir does not exist, the fwcnt package must have -;; removed but not purged, and we should skip the setup. - (when (file-directory-p package-dir) - (setq load-path (cons package-dir load-path)) - (autoload 'fwcnt-mode "fwcnt-mode" - "Major mode for editing fwcnt files." t) - (add-to-list 'auto-mode-alist '("\\.fwcnt$" . fwcnt-mode)))) - diff --git a/debian/fwcnt-default.ex b/debian/fwcnt-default.ex deleted file mode 100644 index 1da5747..0000000 --- a/debian/fwcnt-default.ex +++ /dev/null @@ -1,10 +0,0 @@ -# Defaults for fwcnt initscript -# sourced by /etc/init.d/fwcnt -# installed at /etc/default/fwcnt by the maintainer scripts - -# -# This is a POSIX shell fragment -# - -# Additional options that are passed to the Daemon. -DAEMON_OPTS="" diff --git a/debian/fwcnt.doc-base.EX b/debian/fwcnt.doc-base.EX deleted file mode 100644 index 8f7f9d9..0000000 --- a/debian/fwcnt.doc-base.EX +++ /dev/null @@ -1,22 +0,0 @@ -Document: fwcnt -Title: Debian fwcnt Manual -Author: -Abstract: This manual describes what fwcnt is - and how it can be used to - manage online manuals on Debian systems. -Section: unknown - -Format: debiandoc-sgml -Files: /usr/share/doc/fwcnt/fwcnt.sgml.gz - -Format: postscript -Files: /usr/share/doc/fwcnt/fwcnt.ps.gz - -Format: text -Files: /usr/share/doc/fwcnt/fwcnt.text.gz - -Format: HTML -Index: /usr/share/doc/fwcnt/html/index.html -Files: /usr/share/doc/fwcnt/html/*.html - - diff --git a/debian/init.d.ex b/debian/init.d.ex deleted file mode 100644 index 95c72dc..0000000 --- a/debian/init.d.ex +++ /dev/null @@ -1,81 +0,0 @@ -#! /bin/sh -# -# skeleton example file to build /etc/init.d/ scripts. -# This file should be used to construct scripts for /etc/init.d. -# -# Written by Miquel van Smoorenburg . -# Modified for Debian -# by Ian Murdock . -# -# Version: @(#)skeleton 1.9 26-Feb-2001 miquels@cistron.nl -# - -PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin -DAEMON=/usr/sbin/fwcnt -NAME=fwcnt -DESC=fwcnt - -test -x $DAEMON || exit 0 - -# Include fwcnt defaults if available -if [ -f /etc/default/fwcnt ] ; then - . /etc/default/fwcnt -fi - -set -e - -case "$1" in - start) - echo -n "Starting $DESC: " - start-stop-daemon --start --quiet --pidfile /var/run/$NAME.pid \ - --exec $DAEMON -- $DAEMON_OPTS - echo "$NAME." - ;; - stop) - echo -n "Stopping $DESC: " - start-stop-daemon --stop --quiet --pidfile /var/run/$NAME.pid \ - --exec $DAEMON - echo "$NAME." - ;; - #reload) - # - # If the daemon can reload its config files on the fly - # for example by sending it SIGHUP, do it here. - # - # If the daemon responds to changes in its config file - # directly anyway, make this a do-nothing entry. - # - # echo "Reloading $DESC configuration files." - # start-stop-daemon --stop --signal 1 --quiet --pidfile \ - # /var/run/$NAME.pid --exec $DAEMON - #;; - force-reload) - # - # If the "reload" option is implemented, move the "force-reload" - # option to the "reload" entry above. If not, "force-reload" is - # just the same as "restart" except that it does nothing if the - # daemon isn't already running. - # check wether $DAEMON is running. If so, restart - start-stop-daemon --stop --test --quiet --pidfile \ - /var/run/$NAME.pid --exec $DAEMON \ - && $0 restart \ - || exit 0 - ;; - restart) - echo -n "Restarting $DESC: " - start-stop-daemon --stop --quiet --pidfile \ - /var/run/$NAME.pid --exec $DAEMON - sleep 1 - start-stop-daemon --start --quiet --pidfile \ - /var/run/$NAME.pid --exec $DAEMON -- $DAEMON_OPTS - echo "$NAME." - ;; - *) - N=/etc/init.d/$NAME - # echo "Usage: $N {start|stop|restart|reload|force-reload}" >&2 - echo "Usage: $N {start|stop|restart|force-reload}" >&2 - exit 1 - ;; -esac - -exit 0 diff --git a/debian/manpage.1.ex b/debian/manpage.1.ex deleted file mode 100644 index a7c354d..0000000 --- a/debian/manpage.1.ex +++ /dev/null @@ -1,59 +0,0 @@ -.\" Hey, EMACS: -*- nroff -*- -.\" First parameter, NAME, should be all caps -.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection -.\" other parameters are allowed: see man(7), man(1) -.TH FWCNT SECTION "February 22, 2007" -.\" Please adjust this date whenever revising the manpage. -.\" -.\" Some roff macros, for reference: -.\" .nh disable hyphenation -.\" .hy enable hyphenation -.\" .ad l left justify -.\" .ad b justify to both left and right margins -.\" .nf disable filling -.\" .fi enable filling -.\" .br insert line break -.\" .sp insert n+1 empty lines -.\" for manpage-specific macros, see man(7) -.SH NAME -fwcnt \- program to do something -.SH SYNOPSIS -.B fwcnt -.RI [ options ] " files" ... -.br -.B bar -.RI [ options ] " files" ... -.SH DESCRIPTION -This manual page documents briefly the -.B fwcnt -and -.B bar -commands. -.PP -.\" TeX users may be more comfortable with the \fB\fP and -.\" \fI\fP escape sequences to invode bold face and italics, -.\" respectively. -\fBfwcnt\fP is a program that... -.SH OPTIONS -These programs follow the usual GNU command line syntax, with long -options starting with two dashes (`-'). -A summary of options is included below. -For a complete description, see the Info files. -.TP -.B \-h, \-\-help -Show summary of options. -.TP -.B \-v, \-\-version -Show version of program. -.SH SEE ALSO -.BR bar (1), -.BR baz (1). -.br -The programs are documented fully by -.IR "The Rise and Fall of a Fooish Bar" , -available via the Info system. -.SH AUTHOR -fwcnt was written by . -.PP -This manual page was written by root , -for the Debian project (but may be used by others). diff --git a/debian/manpage.sgml.ex b/debian/manpage.sgml.ex deleted file mode 100644 index de6c788..0000000 --- a/debian/manpage.sgml.ex +++ /dev/null @@ -1,156 +0,0 @@ - manpage.1'. You may view - the manual page with: `docbook-to-man manpage.sgml | nroff -man | - less'. A typical entry in a Makefile or Makefile.am is: - -manpage.1: manpage.sgml - docbook-to-man $< > $@ - - - The docbook-to-man binary is found in the docbook-to-man package. - Please remember that if you create the nroff version in one of the - debian/rules file targets (such as build), you will need to include - docbook-to-man in your Build-Depends control field. - - --> - - - FIRSTNAME"> - SURNAME"> - - February 22, 2007"> - - SECTION"> - popovec@fei.tuke.sk"> - - FWCNT"> - - - Debian"> - GNU"> - GPL"> -]> - - - -
- &dhemail; -
- - &dhfirstname; - &dhsurname; - - - 2003 - &dhusername; - - &dhdate; - - - &dhucpackage; - - &dhsection; - - - &dhpackage; - - program to do something - - - - &dhpackage; - - - - - - - - DESCRIPTION - - This manual page documents briefly the - &dhpackage; and bar - commands. - - This manual page was written for the &debian; distribution - because the original program does not have a manual page. - Instead, it has documentation in the &gnu; - Info format; see below. - - &dhpackage; is a program that... - - - - OPTIONS - - These programs follow the usual &gnu; command line syntax, - with long options starting with two dashes (`-'). A summary of - options is included below. For a complete description, see the - Info files. - - - - - - - - Show summary of options. - - - - - - - - Show version of program. - - - - - - SEE ALSO - - bar (1), baz (1). - - The programs are documented fully by The Rise and - Fall of a Fooish Bar available via the - Info system. - - - AUTHOR - - This manual page was written by &dhusername; &dhemail; for - the &debian; system (but may be used by others). Permission is - granted to copy, distribute and/or modify this document under - the terms of the &gnu; General Public License, Version 2 any - later version published by the Free Software Foundation. - - - On Debian systems, the complete text of the GNU General Public - License can be found in /usr/share/common-licenses/GPL. - - - - - - - - diff --git a/debian/manpage.xml.ex b/debian/manpage.xml.ex deleted file mode 100644 index 5023cbf..0000000 --- a/debian/manpage.xml.ex +++ /dev/null @@ -1,148 +0,0 @@ - -.
will be generated. You may view the -manual page with: nroff -man .
| less'. A -typical entry in a Makefile or Makefile.am is: - -DB2MAN=/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/\ -manpages/docbook.xsl -XP=xsltproc -''-nonet - -manpage.1: manpage.dbk - $(XP) $(DB2MAN) $< - -The xsltproc binary is found in the xsltproc package. The -XSL files are in docbook-xsl. Please remember that if you -create the nroff version in one of the debian/rules file -targets (such as build), you will need to include xsltproc -and docbook-xsl in your Build-Depends control field. - ---> - - - FIRSTNAME"> - SURNAME"> - - February 22, 2007"> - - SECTION"> - popovec@fei.tuke.sk"> - - FWCNT"> - - - Debian"> - GNU"> - GPL"> -]> - - - -
- &dhemail; -
- - &dhfirstname; - &dhsurname; - - - 2003 - &dhusername; - - &dhdate; - - - &dhucpackage; - - &dhsection; - - - &dhpackage; - - program to do something - - - - &dhpackage; - - - - - - - - DESCRIPTION - - This manual page documents briefly the - &dhpackage; and bar - commands. - - This manual page was written for the &debian; distribution - because the original program does not have a manual page. - Instead, it has documentation in the &gnu; - Info format; see below. - - &dhpackage; is a program that... - - - - OPTIONS - - These programs follow the usual &gnu; command line syntax, - with long options starting with two dashes (`-'). A summary of - options is included below. For a complete description, see the - Info files. - - - - - - - - Show summary of options. - - - - - - - - Show version of program. - - - - - - SEE ALSO - - bar (1), baz (1). - - The programs are documented fully by The Rise and - Fall of a Fooish Bar available via the - Info system. - - - AUTHOR - - This manual page was written by &dhusername; &dhemail; for - the &debian; system (but may be used by others). Permission is - granted to copy, distribute and/or modify this document under - the terms of the &gnu; General Public License, Version 2 any - later version published by the Free Software Foundation. - - - On Debian systems, the complete text of the GNU General Public - License can be found in /usr/share/common-licenses/GPL. - - - - - diff --git a/debian/menu.ex b/debian/menu.ex deleted file mode 100644 index 4c30f38..0000000 --- a/debian/menu.ex +++ /dev/null @@ -1,2 +0,0 @@ -?package(fwcnt):needs="X11|text|vc|wm" section="Apps/see-menu-manual"\ - title="fwcnt" command="/usr/bin/fwcnt" diff --git a/debian/postinst b/debian/postinst index 1666aa5..753dfd8 100644 --- a/debian/postinst +++ b/debian/postinst @@ -40,7 +40,6 @@ case "$1" in route -n|awk -F'.' '{if(NR<3)next;if($0 ~ "^0.0.0.0")next;if($0 ~ "^127.0.0")next;print "cntNET "$1"."$2"."$3}'|sort -u >>/etc/fwcnt.conf awk -F':' '{if($0 ~ ":"){if($1 !~ "[:space:]*lo$")print "cntLINK "$1}}' /proc/net/dev >>/etc/fwcnt.conf fi - ln -sf /etc/fwcnt.conf /var/lib/FWcnt/etc/config /usr/lib/FWcnt/install_FWcnt if [ -e /var/lib/FWcnt/FW_rrd_database/upgrade_needed ]; then echo "doing database upgrade... please wait" diff --git a/debian/postinst.ex b/debian/postinst.ex deleted file mode 100644 index 0206562..0000000 --- a/debian/postinst.ex +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/sh -# postinst script for fwcnt -# -# see: dh_installdeb(1) - -set -e - -# summary of how this script can be called: -# * `configure' -# * `abort-upgrade' -# * `abort-remove' `in-favour' -# -# * `abort-remove' -# * `abort-deconfigure' `in-favour' -# `removing' -# -# for details, see http://www.debian.org/doc/debian-policy/ or -# the debian-policy package - - -case "$1" in - configure) - ;; - - abort-upgrade|abort-remove|abort-deconfigure) - ;; - - *) - echo "postinst called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# - -exit 0 - - diff --git a/debian/postrm.ex b/debian/postrm.ex deleted file mode 100644 index d958a6f..0000000 --- a/debian/postrm.ex +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/sh -# postrm script for fwcnt -# -# see: dh_installdeb(1) - -set -e - -# summary of how this script can be called: -# * `remove' -# * `purge' -# * `upgrade' -# * `failed-upgrade' -# * `abort-install' -# * `abort-install' -# * `abort-upgrade' -# * `disappear' -# -# for details, see http://www.debian.org/doc/debian-policy/ or -# the debian-policy package - - -case "$1" in - purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) - ;; - - *) - echo "postrm called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# - -exit 0 - - diff --git a/debian/preinst.ex b/debian/preinst.ex deleted file mode 100644 index bea910f..0000000 --- a/debian/preinst.ex +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/sh -# preinst script for fwcnt -# -# see: dh_installdeb(1) - -set -e - -# summary of how this script can be called: -# * `install' -# * `install' -# * `upgrade' -# * `abort-upgrade' -# for details, see http://www.debian.org/doc/debian-policy/ or -# the debian-policy package - - -case "$1" in - install|upgrade) - ;; - - abort-upgrade) - ;; - - *) - echo "preinst called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# - -exit 0 - - diff --git a/debian/prerm.ex b/debian/prerm.ex deleted file mode 100644 index b65720f..0000000 --- a/debian/prerm.ex +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/sh -# prerm script for fwcnt -# -# see: dh_installdeb(1) - -set -e - -# summary of how this script can be called: -# * `remove' -# * `upgrade' -# * `failed-upgrade' -# * `remove' `in-favour' -# * `deconfigure' `in-favour' -# `removing' -# -# for details, see http://www.debian.org/doc/debian-policy/ or -# the debian-policy package - - -case "$1" in - remove|upgrade|deconfigure) - ;; - - failed-upgrade) - ;; - - *) - echo "prerm called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# - -exit 0 - - diff --git a/debian/rules b/debian/rules index b0159de..2a8d86b 100755 --- a/debian/rules +++ b/debian/rules @@ -45,7 +45,7 @@ clean: rm -f build-stamp configure-stamp # Add here commands to clean up after the build process. - -$(MAKE) clean + $(MAKE) clean dh_clean @@ -58,12 +58,12 @@ install: build # Add here commands to install the package into debian/fwcnt. $(MAKE) DESTDIR=$(CURDIR)/debian/fwcnt install -# Build architecture-independent files here. -binary-indep: build install # We have nothing to do by default. - +# # Build architecture-dependent files here. -binary-arch: build install +#binary-arch: build install +# Build architecture-independent files here. +binary-indep: build install dh_testdir dh_testroot dh_installchangelogs diff --git a/debian/watch.ex b/debian/watch.ex deleted file mode 100644 index 7748247..0000000 --- a/debian/watch.ex +++ /dev/null @@ -1,22 +0,0 @@ -# Example watch control file for uscan -# Rename this file to "watch" and then you can run the "uscan" command -# to check for upstream updates and more. -# See uscan(1) for format - -# Compulsory line, this is a version 3 file -version=3 - -# Uncomment to examine a Webpage -# -#http://www.example.com/downloads.php fwcnt-(.*)\.tar\.gz - -# Uncomment to examine a Webserver directory -#http://www.example.com/pub/fwcnt-(.*)\.tar\.gz - -# Uncommment to examine a FTP server -#ftp://ftp.example.com/pub/fwcnt-(.*)\.tar\.gz debian uupdate - -# Uncomment to find new files on sourceforge, for debscripts >= 2.9 -# http://sf.net/fwcnt/fwcnt-(.*)\.tar\.gz - - diff --git a/init_FWcnt b/init_FWcnt index 656e3d1..6335565 100755 --- a/init_FWcnt +++ b/init_FWcnt @@ -1,6 +1,6 @@ #!/bin/bash (if [ $# -ne 1 ]; then - awk '{if($1=="cntNET") print $2}' /var/lib/FWcnt/etc/config + awk '{if($1=="cntNET") print $2}' /etc/fwcnt.conf else echo "$1" fi)|while read IP;do diff --git a/install_FWcnt b/install_FWcnt index 5fd4920..624b0a9 100755 --- a/install_FWcnt +++ b/install_FWcnt @@ -5,7 +5,7 @@ if [ $# -ge 1 ]; then else MAINT="FWcnt" fi -awk '{if($1=="cntNET"){split ($2,A,".");print A[1]"."A[2]"."A[3]".0"}}'OUTx print_header("default") - while(getline < "/var/lib/FWcnt/etc/config" ){ + while(getline < "/etc/fwcnt.conf" ){ if($1 ~ "^mrtgNET"){ split($2,N,".") C=16 @@ -79,7 +79,7 @@ BEGIN{ printf("default %s\n",$2) >>OUTx } } - close("/var/lib/FWcnt/etc/config"); + close("/etc/fwcnt.conf"); } { TP="default" @@ -140,7 +140,7 @@ if(length(dev)>0){ print "-A FWcnt -j FWcntIN" } print "COMMIT" -}' < /var/lib/FWcnt/etc/config | iptables-restore -n +}' < /etc/fwcnt.conf | iptables-restore -n #install all C ranges diff --git a/ipfm_FWcnt b/ipfm_FWcnt index a850531..b97eb5c 100755 --- a/ipfm_FWcnt +++ b/ipfm_FWcnt @@ -15,7 +15,7 @@ echo "") fi -done