Archives
Archives
| From: | "Matt Thode (prometheanfire)" <prometheanfire@g.o> |
|---|---|
| To: | gentoo-commits@l.g.o |
| Subject: | [gentoo-commits] gentoo-x86 commit in net-analyzer/icinga/files: icinga-apache.conf icinga-init.d-2 |
| Date: | Fri, 02 Dec 2011 22:09:17 |
| Message-Id: | 20111202220906.68A5B2004C@flycatcher.gentoo.org |
| 1 | prometheanfire 11/12/02 22:09:06 |
| 2 | |
| 3 | Modified: icinga-apache.conf icinga-init.d-2 |
| 4 | Log: |
| 5 | moved /var/icinga to /var/lib/icinga |
| 6 | init updated to remove redundant config check (done by default now) |
| 7 | add icinga to nagios group all the time |
| 8 | moved loging around |
| 9 | removed api use flag |
| 10 | |
| 11 | (Portage version: 2.1.10.11/cvs/Linux x86_64) |
| 12 | |
| 13 | Revision Changes Path |
| 14 | 1.2 net-analyzer/icinga/files/icinga-apache.conf |
| 15 | |
| 16 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/icinga/files/icinga-apache.conf?rev=1.2&view=markup |
| 17 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/icinga/files/icinga-apache.conf?rev=1.2&content-type=text/plain |
| 18 | diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/icinga/files/icinga-apache.conf?r1=1.1&r2=1.2 |
| 19 | |
| 20 | Index: icinga-apache.conf |
| 21 | =================================================================== |
| 22 | RCS file: /var/cvsroot/gentoo-x86/net-analyzer/icinga/files/icinga-apache.conf,v |
| 23 | retrieving revision 1.1 |
| 24 | retrieving revision 1.2 |
| 25 | diff -u -r1.1 -r1.2 |
| 26 | --- icinga-apache.conf 15 Nov 2011 00:14:29 -0000 1.1 |
| 27 | +++ icinga-apache.conf 2 Dec 2011 22:09:06 -0000 1.2 |
| 28 | @@ -5,11 +5,19 @@ |
| 29 | Options ExecCGI |
| 30 | Order allow,deny |
| 31 | Allow from all |
| 32 | + AuthName "Icinga Access" |
| 33 | + AuthType Basic |
| 34 | + AuthUserFile /etc/icinga/htpasswd.users |
| 35 | + Require valid-user |
| 36 | </Directory> |
| 37 | Alias /icinga /usr/share/icinga/htdocs |
| 38 | <Directory "/usr/share/icinga/htdocs"> |
| 39 | AllowOverride AuthConfig |
| 40 | Order allow,deny |
| 41 | Allow from all |
| 42 | + AuthName "Icinga Access" |
| 43 | + AuthType Basic |
| 44 | + AuthUserFile /etc/icinga/htpasswd.users |
| 45 | + Require valid-user |
| 46 | </Directory> |
| 47 | </IfDefine> |
| 48 | |
| 49 | |
| 50 | |
| 51 | 1.3 net-analyzer/icinga/files/icinga-init.d-2 |
| 52 | |
| 53 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/icinga/files/icinga-init.d-2?rev=1.3&view=markup |
| 54 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/icinga/files/icinga-init.d-2?rev=1.3&content-type=text/plain |
| 55 | diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/icinga/files/icinga-init.d-2?r1=1.2&r2=1.3 |
| 56 | |
| 57 | Index: icinga-init.d-2 |
| 58 | =================================================================== |
| 59 | RCS file: /var/cvsroot/gentoo-x86/net-analyzer/icinga/files/icinga-init.d-2,v |
| 60 | retrieving revision 1.2 |
| 61 | retrieving revision 1.3 |
| 62 | diff -u -r1.2 -r1.3 |
| 63 | --- icinga-init.d-2 22 Nov 2011 19:21:54 -0000 1.2 |
| 64 | +++ icinga-init.d-2 2 Dec 2011 22:09:06 -0000 1.3 |
| 65 | @@ -16,16 +16,7 @@ |
| 66 | eend $? |
| 67 | } |
| 68 | |
| 69 | -checkconfig() { |
| 70 | - # Silent Check |
| 71 | - /usr/sbin/icinga -v /etc/icinga/icinga.cfg &>/dev/null && return 0 |
| 72 | - # Now we know there's problem - run again and display errors |
| 73 | - /usr/sbin/icinga -v /etc/icinga/icinga.cfg |
| 74 | - eend $? "Configuration Error. Please fix your configfile" |
| 75 | -} |
| 76 | - |
| 77 | start() { |
| 78 | - checkconfig || return 1 |
| 79 | ebegin "Starting icinga" |
| 80 | checkpath -d -o icinga:icinga /tmp/icinga /var/run/icinga /var/log/icinga /var/lib/icinga |
| 81 | checkpath -f -o icinga:icinga /var/log/icinga/icinga.log |