From: Arran Cudbard-Bell Date: Mon, 3 Dec 2012 18:57:49 +0000 (+0000) Subject: Patch freeradius.monitrc file so it works out of the box with debian/ubuntu X-Git-Tag: release_3_0_0_beta1~1433 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b66f67ddb0935d090c46753b507ce99afd6d361b;p=thirdparty%2Ffreeradius-server.git Patch freeradius.monitrc file so it works out of the box with debian/ubuntu --- diff --git a/debian/patches/radiusd-to-freeradius.diff b/debian/patches/radiusd-to-freeradius.diff index 70c20741326..0c05aaac077 100644 --- a/debian/patches/radiusd-to-freeradius.diff +++ b/debian/patches/radiusd-to-freeradius.diff @@ -1,8 +1,3 @@ -## 01-radiusd-to-freeradius.dpatch by Mark Hymers -## DP: change debian binary name from radiusd -> freeradius - -diff --git a/Make.inc.in b/Make.inc.in -index 854bade..0659351 100644 --- a/Make.inc.in +++ b/Make.inc.in @@ -50,7 +50,7 @@ LDFLAGS = @LDFLAGS@ @@ -14,8 +9,6 @@ index 854bade..0659351 100644 SBINDIR = ${sbindir} RADIR = ${radacctdir} LIBRADIUS = $(top_builddir)/src/lib/$(LIBPREFIX)freeradius-radius.la -diff --git a/raddb/radiusd.conf.in b/raddb/radiusd.conf.in -index 0508300..036e8f5 100644 --- a/raddb/radiusd.conf.in +++ b/raddb/radiusd.conf.in @@ -62,7 +62,7 @@ radacctdir = @radacctdir@ @@ -38,3 +31,19 @@ index 0508300..036e8f5 100644 # Core dumps are a bad thing. This should only be set to # 'yes' if you're debugging a problem with the server. +--- a/scripts/freeradius.monitrc ++++ b/scripts/freeradius.monitrc +@@ -8,9 +8,9 @@ + # Totalmem limit should be lowered to 200.0 if none of the + # interpreted language modules or rlm_cache are being used. + # +-check process radiusd with pidfile /var/run/radiusd/radiusd.pid +- start program = "/etc/init.d/radiusd start" +- stop program = "/etc/init.d/radiusd stop" ++check process freeradius with pidfile /var/run/freeradius/freeradius.pid ++ start program = "/etc/init.d/freeradius start" ++ stop program = "/etc/init.d/freeradius stop" + if failed host 127.0.0.1 port 1812 type udp protocol radius secret testing123 then alert + if failed host 127.0.0.1 port 1813 type udp protocol radius secret testing123 then alert + if cpu > 95% for 2 cycles then alert + diff --git a/scripts/freeradius.monit b/scripts/freeradius.monitrc similarity index 100% rename from scripts/freeradius.monit rename to scripts/freeradius.monitrc