mirror of
https://github.com/jrbrtsn/ban2fail
synced 2024-06-16 11:58:01 +00:00
Improved installation
This commit is contained in:
parent
71b6b1f97b
commit
ecee28e685
3
Makefile
3
Makefile
@ -20,6 +20,7 @@ src := \
|
|||||||
ez_es.c \
|
ez_es.c \
|
||||||
ez_libc.c \
|
ez_libc.c \
|
||||||
ez_libdb.c \
|
ez_libdb.c \
|
||||||
|
ez_libpthread.c \
|
||||||
ez_libz.c \
|
ez_libz.c \
|
||||||
iptables.c \
|
iptables.c \
|
||||||
logType.c \
|
logType.c \
|
||||||
@ -79,7 +80,7 @@ install : release
|
|||||||
@[ $(install_dir)_foo = _foo ] || cp release/ban2fail $(install_dir)/
|
@[ $(install_dir)_foo = _foo ] || cp release/ban2fail $(install_dir)/
|
||||||
@strip release/fsckdns
|
@strip release/fsckdns
|
||||||
@[ $(install_dir)_foo = _foo ] || cp release/fsckdns $(install_dir)/
|
@[ $(install_dir)_foo = _foo ] || cp release/fsckdns $(install_dir)/
|
||||||
@[ -e install.sh ] && INSTALLDIR=$(install_dir) INSTALLTYPE=$(install_type) ./install.sh
|
@[ -e install.sh ] && INSTALLDIR=$(install_dir) INSTALLTYPE=$(install_type) sudo ./install.sh
|
||||||
uninstall :
|
uninstall :
|
||||||
clean :
|
clean :
|
||||||
$(RM) -r $(versions) core *.bak *.tab.h *.tab.c *.yy.c *.yy.h
|
$(RM) -r $(versions) core *.bak *.tab.h *.tab.c *.yy.c *.yy.h
|
||||||
|
47
install.sh
47
install.sh
@ -2,6 +2,11 @@
|
|||||||
|
|
||||||
set -u
|
set -u
|
||||||
|
|
||||||
|
if [[ $(id -u) != 0 ]]; then
|
||||||
|
echo 'This script must be run as root!'
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
BINDIR=/usr/local/bin
|
BINDIR=/usr/local/bin
|
||||||
CONFDIR=/etc/ban2fail
|
CONFDIR=/etc/ban2fail
|
||||||
OTHERDIR=/usr/local/share/ban2fail
|
OTHERDIR=/usr/local/share/ban2fail
|
||||||
@ -17,38 +22,38 @@ LOCKDIR=/run/lock/ban2fail
|
|||||||
TEST_LOCKDIR=${LOCKDIR}-test
|
TEST_LOCKDIR=${LOCKDIR}-test
|
||||||
|
|
||||||
# Make sure directories exist with correct ownership & mode
|
# Make sure directories exist with correct ownership & mode
|
||||||
[[ -e $OTHERDIR ]] || sudo mkdir $OTHERDIR
|
[[ -e $OTHERDIR ]] || mkdir $OTHERDIR
|
||||||
sudo chmod 2755 $OTHERDIR
|
chmod 2755 $OTHERDIR
|
||||||
sudo chown .adm $OTHERDIR
|
chown .adm $OTHERDIR
|
||||||
|
|
||||||
[[ -e $CONFDIR ]] || sudo mkdir $CONFDIR
|
[[ -e $CONFDIR ]] || mkdir $CONFDIR
|
||||||
sudo chmod 2750 $CONFDIR
|
chmod 2750 $CONFDIR
|
||||||
sudo chown .adm $CONFDIR
|
chown .adm $CONFDIR
|
||||||
# TODO: substitute correct hostname in config
|
# TODO: substitute correct hostname in config
|
||||||
[[ -e $CONFDIR/$CONF ]] || sudo cp $CONF $CONFDIR
|
[[ -e $CONFDIR/$CONF ]] || cp $CONF $CONFDIR
|
||||||
|
|
||||||
[[ -e $BINDIR ]] || sudo mkdir $BINDIR
|
[[ -e $BINDIR ]] || mkdir $BINDIR
|
||||||
|
|
||||||
# No need for debugging symbols in binary
|
# No need for debugging symbols in binary
|
||||||
strip release/$BIN
|
strip release/$BIN
|
||||||
sudo cp -f release/$BIN $BINDIR/
|
cp -f release/$BIN $BINDIR/
|
||||||
sudo chown .adm $BINDIR/$BIN
|
chown .adm $BINDIR/$BIN
|
||||||
# Need suid bit so non-root can run iptables
|
# Need suid bit so non-root can run iptables
|
||||||
sudo chmod 4755 $BINDIR/$BIN
|
chmod 4755 $BINDIR/$BIN
|
||||||
|
|
||||||
chmod +x $SVCSH
|
chmod +x $SVCSH
|
||||||
sudo cp -f $SVCSH $OTHERDIR/
|
cp -f $SVCSH $OTHERDIR/
|
||||||
|
|
||||||
systemctl status ban2fail &>/dev/null && sudo systemctl stop ban2fail
|
systemctl status ban2fail &>/dev/null && systemctl stop ban2fail
|
||||||
# Clean out cache and lockfiles
|
# Clean out cache and lockfiles
|
||||||
[[ -e $CACHEDIR ]] && sudo rm -r $CACHEDIR
|
[[ -e $CACHEDIR ]] && rm -r $CACHEDIR
|
||||||
[[ -e $TEST_CACHEDIR ]] && sudo rm -r $TEST_CACHEDIR
|
[[ -e $TEST_CACHEDIR ]] && rm -r $TEST_CACHEDIR
|
||||||
[[ -e $LOCKDIR ]] && sudo rm -r $LOCKDIR
|
[[ -e $LOCKDIR ]] && rm -r $LOCKDIR
|
||||||
[[ -e $TEST_LOCKDIR ]] && sudo rm -r $TEST_LOCKDIR
|
[[ -e $TEST_LOCKDIR ]] && rm -r $TEST_LOCKDIR
|
||||||
sudo cp $SVC $SVCDIR/
|
cp $SVC $SVCDIR/
|
||||||
sudo systemctl daemon-reload
|
systemctl daemon-reload
|
||||||
sudo systemctl start ban2fail
|
systemctl start ban2fail
|
||||||
sudo systemctl enable ban2fail
|
systemctl enable ban2fail
|
||||||
|
|
||||||
echo "Installation completed successfully"
|
echo "Installation completed successfully"
|
||||||
systemctl status ban2fail
|
systemctl status ban2fail
|
||||||
|
Loading…
Reference in New Issue
Block a user