public inbox for ipfire-scm@lists.ipfire.org
 help / color / mirror / Atom feed
From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 29268dee3b61bde26b8ea3183e4bf13a50b3920c
Date: Sat, 04 Apr 2015 14:18:06 +0200	[thread overview]
Message-ID: <20150404121807.2B81C2074C@argus.ipfire.org> (raw)

[-- Attachment #1: Type: text/plain, Size: 2038 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, master has been updated
       via  29268dee3b61bde26b8ea3183e4bf13a50b3920c (commit)
      from  6949953b7f8639d6ceca852416e285d3a04dd1e2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 29268dee3b61bde26b8ea3183e4bf13a50b3920c
Author: Dirk Wagner <dirk.wagner(a)ipfire.org>
Date:   Sun Mar 22 22:33:30 2015 +0100

    mont addon: added missing dir /var/lib/monit to distribution
    
    Conflicts:
    	lfs/monit

-----------------------------------------------------------------------

Summary of changes:
 config/rootfiles/packages/monit | 1 +
 lfs/monit                       | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

Difference in files:
diff --git a/config/rootfiles/packages/monit b/config/rootfiles/packages/monit
index 049bab3..4477ea3 100644
--- 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 6c35c6c..0998d59 100644
--- 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
 


hooks/post-receive
--
IPFire 2.x development tree

                 reply	other threads:[~2015-04-04 12:18 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20150404121807.2B81C2074C@argus.ipfire.org \
    --to=git@ipfire.org \
    --cc=ipfire-scm@lists.ipfire.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox