tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Refactor mods-enabled/mods-available.

This commit is contained in:
Gunnar Beutner 2013-09-27 11:16:35 +02:00
parent 28236f341a
commit 2d3e639fac
8 changed files with 79 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure.ac
View File

@ -139,7 +139,7 @@ docs/Makefile
etc/Makefile
etc/icinga2/Makefile
etc/icinga2/conf.d/Makefile
etc/icinga2/mods-available/Makefile
etc/icinga2/features-available/Makefile
etc/init.d/Makefile
icinga-app/Makefile
itl/Makefile
@ -155,7 +155,7 @@ third-party/cJSON/Makefile
third-party/execvpe/Makefile
third-party/mmatch/Makefile
tools/Makefile
tools/i2modconf
tools/i2enfeature
tools/mkembedconfig/Makefile
])
AC_OUTPUT([

8
etc/icinga2/Makefile.am
View File

@ -2,7 +2,7 @@
SUBDIRS = \
conf.d \
mods-available
features-available
icinga2confdir = $(sysconfdir)/icinga2
@ -20,7 +20,7 @@ EXTRA_DIST = $(CONFIG_FILES)
install-exec-hook:
@cd $(icinga2confdir) && \
if [ ! -e mods-enabled ]; then \
$(MKDIR_P) mods-enabled && \
$(LN_S) ../mods-available/compat.conf mods-enabled/; \
if [ ! -e features-enabled ]; then \
$(MKDIR_P) features-enabled && \
$(LN_S) ../features-available/compat.conf features-enabled/; \
fi

6
etc/icinga2/mods-available/Makefile.am → etc/icinga2/features-available/Makefile.am
View File

@ -1,8 +1,6 @@
## Process this file with automake to produce Makefile.in
icinga2confdir = $(sysconfdir)/icinga2/mods-available
icinga2conf_DATA = \
compat.load
icinga2confdir = $(sysconfdir)/icinga2/features-available
CONFIG_FILES = \
compat.conf
@ -15,4 +13,4 @@ install-data-local:
fi; \
done
EXTRA_DIST = $(CONFIG_FILES) $(icinga2conf_DATA)
EXTRA_DIST = $(CONFIG_FILES)

2
etc/icinga2/mods-available/compat.conf → etc/icinga2/features-available/compat.conf
View File

@ -4,7 +4,7 @@
* hosts and services. CompatLog writeis the Icinga 1.x icinga.log and archives.
*/
include "compat.load"
library "compat"
object StatusDataWriter "status" { }
object ExternalCommandListener "command" { }

2
etc/icinga2/mods-available/compat.load
View File

@ -1,2 +0,0 @@
library "compat"

7
tools/Makefile.am
View File

@ -1,11 +1,10 @@
SUBDIRS = \
mkembedconfig
bin_SCRIPTS = i2modconf
bin_SCRIPTS = i2enfeature
CLEANFILES = $(bin_SCRIPTS)
EXTRA_DIST = i2modconf.in
EXTRA_DIST = i2enfeature.in
install-exec-hook:
$(LN_S) -f i2modconf $(bindir)/i2enmod
$(LN_S) -f i2modconf $(bindir)/i2dismod
$(LN_S) -f i2enfeature $(bindir)/i2disfeature

67
tools/i2enfeature.in Normal file
View File

@ -0,0 +1,67 @@
#!/bin/sh
prefix=@prefix@
exec_prefix=@exec_prefix@
sbindir=@sbindir@
bindir=@bindir@
sysconfdir=@sysconfdir@
localstatedir=@localstatedir@
ICINGA2CONFDIR=@sysconfdir@/icinga2
TOOL=$(basename -- $0)
if [ "$TOOL" != "i2enfeature" -a "$TOOL" != "i2disfeature" ]; then
echo "Invalid tool name ($TOOL). Should be 'i2enfeature' or 'i2disfeature'."
exit 1
fi
if [ -z "$1" ]; then
echo "Syntax: $0 <feature>"
if [ "$TOOL" = "i2enfeature" ]; then
echo "Enables the specified feature."
else
echo "Disables the specified feature."
fi
echo
echo -n "Available feature: "
for file in $ICINGA2CONFDIR/mods-available/*.conf; do
echo -n $(basename -- $file .conf)
done
echo
exit 1
fi
FEATURE=$1
if [ ! -e $ICINGA2CONFDIR/mods-available/$FEATURE.conf ]; then
echo "The feature '$FEATURE' does not exist."
exit 1
fi
if [ "$TOOL" = "i2enfeature" ]; then
if [ -e $ICINGA2CONFDIR/mods-enabled/$FEATURE.conf ]; then
echo "The feature '$FEATURE' is already enabled."
exit 0
fi
ln -s ../mods-available/$FEATURE.conf $ICINGA2CONFDIR/mods-enabled/
echo "Module '$FEATURE' was enabled."
elif [ "$TOOL" = "i2disfeature" ]; then
if [ ! -e $ICINGA2CONFDIR/mods-enabled/$FEATURE.conf ]; then
echo "The feature '$FEATURE' is already disabled."
exit 0
fi
rm -f $ICINGA2CONFDIR/mods-enabled/$FEATURE.conf
echo "Module '$FEATURE' was disabled."
fi
echo "Make sure to restart Icinga 2 for these changes to take effect."
exit 0

67
tools/i2modconf.in
View File

@ -1,67 +0,0 @@
#!/bin/sh
prefix=@prefix@
exec_prefix=@exec_prefix@
sbindir=@sbindir@
bindir=@bindir@
sysconfdir=@sysconfdir@
localstatedir=@localstatedir@
ICINGA2CONFDIR=@sysconfdir@/icinga2
TOOL=$(basename -- $0)
if [ "$TOOL" != "i2enmod" -a "$TOOL" != "i2dismod" ]; then
echo "Invalid tool name ($TOOL). Should be 'i2enmod' or 'i2dismod'."
exit 1
fi
if [ -z "$1" ]; then
echo "Syntax: $0 <module>"
if [ "$TOOL" = "i2enmod" ]; then
echo "Enables the specified module."
else
echo "Disables the specified module."
fi
echo
echo -n "Available modules: "
for file in $ICINGA2CONFDIR/mods-available/*.conf; do
echo -n $(basename -- $file .conf)
done
echo
exit 1
fi
MOD=$1
if [ ! -e $ICINGA2CONFDIR/mods-available/$MOD.conf ]; then
echo "The module '$MOD' does not exist."
exit 1
fi
if [ "$TOOL" = "i2enmod" ]; then
if [ -e $ICINGA2CONFDIR/mods-enabled/$MOD.conf ]; then
echo "The module '$MOD' is already enabled."
exit 0
fi
ln -s ../mods-available/$MOD.conf $ICINGA2CONFDIR/mods-enabled/
echo "Module '$MOD' was enabled."
elif [ "$TOOL" = "i2dismod" ]; then
if [ ! -e $ICINGA2CONFDIR/mods-enabled/$MOD.conf ]; then
echo "The module '$MOD' is already disabled."
exit 0
fi
rm -f $ICINGA2CONFDIR/mods-enabled/$MOD.conf
echo "Module '$MOD' was disabled."
fi
echo "Make sure to restart Icinga 2 for these changes to take effect."
exit 0