Merge branch 'master' into tor

diff --git a/config/rootfiles/core/89/filelists/files b/config/rootfiles/core/89/filelists/files
index 5ed7194495a94a7b854ae99dc3f8a5d5e5af9952..f344208d592b238e562f5bc42de064e16ef77a75 100644 (file)
--- a/config/rootfiles/core/89/filelists/files
+++ b/config/rootfiles/core/89/filelists/files
@@ -11,6 +11,7 @@ srv/web/ipfire/cgi-bin/netovpnrw.cgi
 srv/web/ipfire/cgi-bin/netovpnsrv.cgi
 srv/web/ipfire/cgi-bin/ovpnmain.cgi
 srv/web/ipfire/cgi-bin/vpnmain.cgi
+usr/local/bin/openvpnctrl
 var/ipfire/backup/bin/backup.pl
 var/ipfire/graphs.pl
 var/ipfire/langs

diff --git a/config/rootfiles/packages/monit b/config/rootfiles/packages/monit
index 049bab351a5072defe29994f5c84f16933d27fa2..4477ea3d207c414bded7d4c4a2911a641ba4aeda 100644 (file)
--- a/config/rootfiles/packages/monit
+++ b/config/rootfiles/packages/monit
@@ -1,6 +1,7 @@
 etc/monitrc
 usr/bin/monit
 #usr/share/man/man1/monit.1
+var/lib/monit
 var/ipfire/backup/addons/includes/monit
 etc/rc.d/init.d/monit
 etc/rc.d/rc0.d/K40monit

diff --git a/lfs/monit b/lfs/monit
index 6c35c6ced91f74ad39773a19c3a6c8d8d4204d38..0998d59ee740ae04cc68d170595d3dabff192434 100644 (file)
--- a/lfs/monit
+++ b/lfs/monit
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = monit
-PAK_VER    = 3
+PAK_VER    = 4
 
 DEPS       = ""
 
@@ -81,6 +81,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
 
+       mkdir -p /var/lib/monit
+
        install -v -m 644 $(DIR_SRC)/config/backup/includes/monit \
                         /var/ipfire/backup/addons/includes/monit