Major upgrades:

Adding some new files/directories.
Adjust some existing backups.
This commit is contained in:
2017-02-25 04:10:05 +01:00
parent 44f6559042
commit 81dd5e7a2a
3 changed files with 623 additions and 333 deletions

View File

@ -59,14 +59,18 @@ exit
}
function echo_OK() {
echo_OK() {
echo -en "\\033[45G[ \\033[1;32mOK\\033[0;39m ]\n"
}
function echo_FAILED() {
echo_FAILED() {
echo -en "\\033[45G[ \\033[1;31mFAIL\\033[0;39m ]\n"
}
echo_SKIPPED() {
echo -en "\\033[45G[ \\033[1;37mFAIL\\033[0;39m ]\n"
}
[ $# -ne "1" ] && usage "wrong number of arguments"
@ -176,40 +180,42 @@ fi
# - DHCP Server
# - /etc/dhcp/dhcpd.conf
echo -en "\tDHCP Server settings.."
if [ -d /etc/dhcp ]; then
cp -a ${base_dir}/${network}/dhcpd.conf.${network} /etc/dhcp/dhcpd.conf
if [ "$?" != "0" ]; then
echo_FAILED
else
echo_OK
fi
elif [ -d /etc/dhcp3 ];then
cp -a ${base_dir}/${network}/dhcpd.conf.${network} /etc/dhcp3/dhcpd.conf
if [ "$?" != "0" ]; then
echo_FAILED
else
echo_OK
fi
fi
if [ -f ${base_dir}/${network}/dhcpd6.conf.${network} ];then
echo -en "\tDHCP IPv6 Server settings.."
if [ -d /etc/dhcp ]; then
cp -a ${base_dir}/${network}/dhcpd6.conf.${network} /etc/dhcp/dhcpd6.conf
if [ "$?" != "0" ]; then
echo_FAILED
else
echo_OK
fi
elif [ -d /etc/dhcp3 ];then
cp -a ${base_dir}/${network}/dhcpd6.conf.${network} /etc/dhcp3/dhcpd6.conf
if [ "$?" != "0" ]; then
echo_FAILED
else
echo_OK
files="dhcpd.conf.${network}
dhcpd6.conf.${network}
hosts.lan.conf.${_network}
hosts.w-lan.conf.${_network}"
failed=false
success=false
for file in $files ; do
file_real_name="${file%.*}"
if [[ -f "${base_dir}/${network}/$file" ]]; then
if [[ -d /etc/dhcp ]]; then
cp -a ${base_dir}/${network}/$file /etc/dhcp/
if [[ "$?" = "0" ]]; then
success=true
else
failed=true
fi
elif [[ -d /etc/dhcp3 ]] ;then
cp -a ${base_dir}/${network}/$file /etc/dhcp3/
if [[ "$?" = "0" ]]; then
success=true
else
failed=true
fi
fi
fi
done
if $failed ; then
echo_FAILED
elif $success ; then
echo_OK
else
echo_SKIPPED
fi
#if [ -f "${base_dir}/${network}/isc-dhcp6-server.${network}" ]; then
# echo -en "\tINIT-Script isc-dhcp6-server.."
# cp -a ${base_dir}/${network}/isc-dhcp6-server.${network} /etc/init.d/isc-dhcp6-server
@ -224,19 +230,23 @@ fi
# - DSL:
# - /etc/ppp/peers/dsl-provider
# - /etc/ppp/ip-up.d/email_notice
rval=true
echo -en "\tDSL settings.."
_rval=true
cp -a ${base_dir}/${network}/dsl-provider.${network} /etc/ppp/peers/dsl-provider
if [ "$?" != "0" ]; then
_rval=false
if [[ -d "/etc/ppp/peers" ]]; then
if [[ -d "{base_dir}/${network}/peers" ]]; then
cp -a ${base_dir}/${network}/peers/* /etc/ppp/peers/
if [ "$?" != "0" ]; then
_rval=false
fi
fi
fi
_network_name=`echo $network | tr '[:upper:]' '[:lower:]'`
if [ -f ${base_dir}/${network}/dsl-${_network_name}.${network} ]; then
cp -a ${base_dir}/${network}/dsl-${_network_name}.${network} /etc/ppp/peers/dsl-${_network_name}
fi
cp -a ${base_dir}/${network}/email_notice.${network} /etc/ppp/ip-up.d/email_notice
if [ "$?" != "0" ]; then
_rval=false
if [[ -f "{base_dir}/${network}/email_notice.${network}" ]] ; then
cp -a ${base_dir}/${network}/email_notice.${network} /etc/ppp/ip-up.d/email_notice
if [ "$?" != "0" ]; then
_rval=false
fi
fi
cp -a ${base_dir}/${network}/pap-secrets.${network} /etc/ppp/pap-secrets
if [ "$?" != "0" ]; then
@ -323,17 +333,95 @@ else
fi
# - Firewall:
# - /usr/local/src directory
# -
echo -en "\tFirewall.."
if [ -f ${base_dir}/${network}/ipt-firewall.${network} ]; then
cp -a ${base_dir}/${network}/ipt-firewall.${network} /etc/init.d/ipt-firewall
if [ "$?" != "0" ]; then
echo -en "\t/root/bin directory"
if [[ -d "${base_dir}/${network}/bin" ]]; then
if [[ ! -d "/root/bin" ]]; then
mkdir /root/bin
fi
cp -a ${base_dir}/${network}/bin/* /root/bin/
if ! $_rval ; then
echo_FAILED
else
echo_OK
fi
else
echo_SKIPPED
fi
# - /usr/local/src directory
# -
echo -en "\t/usr/local/src directory"
if [[ -d "${base_dir}/${network}/src" ]]; then
cp -a ${base_dir}/${network}/src/* /usr/local/src/
if ! $_rval ; then
echo_FAILED
else
echo_OK
fi
else
echo_SKIPPED
fi
# - /usr/local/sbin directory
# -
echo -en "\t/usr/local/sbin directory"
if [[ -d "${base_dir}/${network}/sbin" ]]; then
cp -a ${base_dir}/${network}/sbin/* /usr/local/sbin/
if ! $_rval ; then
echo_FAILED
else
echo_OK
fi
else
echo_SKIPPED
fi
# - Firewall:
# -
_rval=true
echo -en "\tFirewall.."
if [[ -d "${base_dir}/${network}/ipt-firewall" ]]; then
if [[ -d "/etc/ipt-firewall" ]]; then
rm -rf /etc/ipt-firewall
fi
mkdir -p /etc/ipt-firewall
cp -a ${base_dir}/${network}/ipt-firewall /etc/
if [ "$?" != "0" ]; then
_rval=false
fi
else
if [[ -d "/etc/ipt-firewall" ]]; then
rm -rf /etc/ipt-firewall
fi
fi
if [ -f ${base_dir}/${network}/ipt-firewall.${network} ]; then
cp -a ${base_dir}/${network}/ipt-firewall.${network} /etc/init.d/ipt-firewall
if [ "$?" != "0" ]; then
_rval=false
fi
else
rm -f /etc/init.d/ipt-firewall
fi
if [ -f ${base_dir}/${network}/ip6t-firewall.${network} ]; then
cp -a ${base_dir}/${network}/ip6t-firewall.${network} /etc/init.d/ip6t-firewall
if [ "$?" != "0" ]; then
_rval=false
fi
else
if [ -f "/etc/init.d/ip6t-firewall" ]; then
rm -f /etc/init.d/ip6t-firewall
fi
fi
if [ -f ${base_dir}/${network}/ip6t-firewall.${network} ]; then
echo -en "\tFirewall IPv6.."
cp -a ${base_dir}/${network}/ip6t-firewall.${network} /etc/init.d/ip6t-firewall
@ -347,102 +435,114 @@ else
rm /etc/init.d/ip6t-firewall
fi
fi
_rval=true
if [ -f ${base_dir}/${network}/ipt-firewall.service.${_network} ] ; then
if [[ -f "${base_dir}/${network}/ipt-firewall.service.${network}" ]]; then
cp ${base_dir}/${network}/ipt-firewall.service.${network} /etc/systemd/system/ipt-firewall.service
if [ "$?" != "0" ]; then
_rval=false
fi
systemctl daemon-reload
if [ "$?" != "0" ]; then
_rval=false
fi
systemctl enable ipt-firewall.service
if [ "$?" != "0" ]; then
_rval=false
fi
cp -a ${base_dir}/${network}/ipt-firewall.service.${_network} /etc/systemd/system/ipt-firewall.service
if [ "$?" != "0" ]; then
_rval=false
fi
cp -a ${base_dir}/${network}/ipt-firewall-gateway.${_network} /usr/local/sbin/ipt-firewall-gateway
if [ "$?" != "0" ]; then
_rval=false
fi
mkdir -p /etc/ipt-firewall
if [ "$?" != "0" ]; then
_rval=false
fi
cp -a ${base_dir}/${network}/ipt-firewall-gateway.conf.${_network} /etc/ipt-firewall/ipt-firewall-gateway.conf
if [ "$?" != "0" ]; then
_rval=false
fi
if ! $_rval ; then
echo_FAILED
else
echo_OK
else
if [[ -f "/etc/systemd/system/ipt-firewall.service" ]]; then
systemctl disable ipt-firewall.service
rm /etc/systemd/system/ipt-firewall.service
fi
fi
_rval=true
if [ -f ${base_dir}/${network}/ip6t-firewall.service.${_network} ] ; then
if [[ -f "${base_dir}/${network}/ip6t-firewall.service.${network}" ]]; then
cp ${base_dir}/${network}/ip6t-firewall.service.${network} /etc/systemd/system/ip6t-firewall.service
if [ "$?" != "0" ]; then
_rval=false
fi
systemctl daemon-reload
if [ "$?" != "0" ]; then
_rval=false
fi
systemctl enable ip6t-firewall.service
if [ "$?" != "0" ]; then
_rval=false
fi
cp -a ${base_dir}/${network}/ip6t-firewall.service.${_network} /etc/systemd/system/ip6t-firewall.service
if [ "$?" != "0" ]; then
_rval=false
fi
cp -a ${base_dir}/${network}/ip6t-firewall-gateway.${_network} /usr/local/sbin/ip6t-firewall-gateway
if [ "$?" != "0" ]; then
_rval=false
fi
cp -a ${base_dir}/${network}/ip6t-firewall-gateway.conf.${_network} /etc/ipt-firewall/ip6t-firewall-gateway.conf
if [ "$?" != "0" ]; then
_rval=false
fi
if ! $_rval ; then
echo_FAILED
else
echo_OK
else
if [[ -f "/etc/systemd/system/ip6t-firewall.service" ]]; then
systemctl disable ip6t-firewall.service
rm /etc/systemd/system/ip6t-firewall.service
fi
fi
if ! $_rval ; then
echo_FAILED
else
echo_OK
fi
# - Check Script Onlinestatus
# -
echo -en "\tCheck Script Onlinestatus.."
_rval=true
if [[ -d "${base_dir}/${network}/check_net" ]]; then
if [[ -d "/etceck_net" ]]; then
rm -rf /etc/check_net
fi
mkdir -p /etc/check_net
cp -a ${base_dir}/${network}/check_net /etc/
if [ "$?" != "0" ]; then
_rval=false
fi
else
if [[ -d "/etc/check_net" ]]; then
rm -rf /etc/check_net
fi
fi
if [ -f ${base_dir}/${network}/check_net.service.${_network} ] ; then
cp -a ${base_dir}/${network}/check_net.service.${_network} /etc/systemd/system/check_net.service
if [ "$?" != "0" ]; then
_rval=false
fi
systemctl daemon-reload
systemctl enable check_net.service
if [ "$?" != "0" ]; then
_rval=false
fi
cp -a ${base_dir}/${network}/check_net.sh.${_network} /usr/local/sbin/check_net/check_net.sh
if [ "$?" != "0" ]; then
_rval=false
fi
cp -a ${base_dir}/${network}/netconfig.sh.${_network} /usr/local/sbin/check_net/netconfig.sh
if [ "$?" != "0" ]; then
_rval=false
fi
cp -a ${base_dir}/${network}/check_net.conf.${_network} /etc/check_net/check_net.conf
if [ "$?" != "0" ]; then
_rval=false
fi
mkdir -p /etc/check_net
if [ "$?" != "0" ]; then
_rval=false
else
if [[ -f "/etc/systemd/system/check_net.service" ]]; then
systemctl disable check_net.service
rm /etc/systemd/system/check_net.service
systemctl daemon-reload
fi
fi
if [[ -f "${base_dir}/${network}/check_net-logrotate.${_network}" ]]; then
cp -a ${base_dir}/${network}/check_net-logrotate.${_network} /etc/logrotated.d/check_net
if [ "$?" != "0" ]; then
_rval=false
fi
if ! $_rval ; then
echo_FAILED
else
echo_OK
else
if [[ -f "/etc/logrotated.d/check_net" ]]; then
rm /etc/logrotated.d/check_net
fi
fi
if ! $_rval ; then
echo_FAILED
else
echo_OK
fi
# - Other files
# -
#if $_igmproxy ; then
if [ -f ${base_dir}/${network}/igmpproxy.conf.${network} ];then
echo -en "\tConfigure igmproxy (Entertain TV).."
PID=`ps aux | grep "/igmpproxy " | grep -v grep | awk '{print$2}'`
@ -528,7 +628,7 @@ else
fi
echo -en "\tSetting up rc.local.."
if [ "$network" = "NONE-CKUBU" -o "$network" = "NONE-WF" ];then
if [ "$network" = "NONE-CKUBU" -o "$network" = "NONE-WF" -o "$network" = "GA-Ersatz" ];then
cp -a ${base_dir}/rc.local.NONE /etc/rc.local
else
#cp -a ${base_dir}/rc.local /etc/rc.local