Logoj0ke.net Open Build Service > Projects > internetx:projects:monitoring > monit > Changes
Sign Up | Log In

Changes of Revision 16

[-] Changed monit.spec
​x
 
1
@@ -11,7 +11,8 @@
2
 Source2:        monit.logrotate
3
 Source3:   create_monit_ssl.sh
4
 Source4:   stunnel-check
5
-source5:   ix-monit.conf
6
+Source5:   ix-monit.conf
7
+Source6:   sample-checks.tar.gz
8
 Patch0:         monit-default-config-name.patch
9
 Patch1:         monit-no-startup-msg.patch
10
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
11
@@ -42,9 +43,9 @@
12
 make install DESTDIR=$RPM_BUILD_ROOT
13
14
 install -p -D -m0755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/monit
15
-install -p -D -m0600 monitrc $RPM_BUILD_ROOT%{_sysconfdir}/monit.conf
16
-install -p -D -m0755 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/monit.d/stunnel
17
-install -p -D -m0755 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/monit.d/ix-monit.conf
18
+install -p -D -m0600 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/monit.conf
19
+install -p -D -m0755 %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/monit.d/sample-checks.tar.gz
20
+#install -p -D -m0755 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/monit.d/ix-monit.conf
21
 install -p -D -m0755 monit $RPM_BUILD_ROOT%{_bindir}/monit
22
 install -p -D -m0755 %{SOURCE3} $RPM_BUILD_ROOT%{_bindir}/create_monit_ssl
23
24
@@ -55,15 +56,7 @@
25
26
 # Let's include some good defaults
27
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/monit.d
28
-echo "
29
-# set daemon mode timeout to 1 minute
30
-set daemon 60
31
-# Include all files from %{_sysconfdir}/monit.d/
32
-include %{_sysconfdir}/monit.d/*" >> $RPM_BUILD_ROOT%{_sysconfdir}/monit.conf
33
-
34
-echo "# log to monit.log
35
-set logfile /var/log/monit
36
-" > $RPM_BUILD_ROOT%{_sysconfdir}/monit.d/logging
37
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/monit.ssl
38
39
40
 %clean
41
@@ -72,6 +65,14 @@
42
 %post
43
 # This adds the proper /etc/rc*.d links for the script
44
 /sbin/chkconfig --add monit
45
+/usr/bin/create_monit_ssl
46
+
47
+####
48
+
49
+echo "###################################################"
50
+echo "SSL Certs got created, and stored in /etc/monit.ssl"
51
+echo "###################################################"
52
+
53
54
 %preun
55
 if [ $1 = 0 ]; then
56
@@ -91,11 +92,13 @@
57
 %doc COPYING README
58
 %config(noreplace) %{_sysconfdir}/monit.conf
59
 %config(noreplace) %{_sysconfdir}/monit.d/logging
60
-%config(noreplace) %{_sysconfdir}/monit.d/stunnel
61
 %config(noreplace) %{_sysconfdir}/monit.d/ix-monit.conf
62
+%config(noreplace) %{_sysconfdir}/monit.d/sample-checks.tar.gz
63
+%config(noreplace) %{_sysconfdir}/monit.ssl/*
64
 %config(noreplace) %{_sysconfdir}/logrotate.d/monit
65
 %ghost %{_localstatedir}/log/monit
66
 %{_sysconfdir}/monit.d/
67
+%{_sysconfdir}/monit.ssl/
68
 %{_initrddir}/monit
69
 %{_bindir}/%{name}
70
 %{_bindir}/create_monit_ssl
71
​
[+] Changed create_monit_ssl.sh ^
[+] Changed ix-monit.conf ^
[+] Changed mmonit.pem ^

Cancel