diff --git a/change_network_gateway.sh b/change_network_gateway.sh index 8171fc8..fef199c 100755 --- a/change_network_gateway.sh +++ b/change_network_gateway.sh @@ -43,6 +43,7 @@ Usage: `basename $0` NONE-WF NONE-CKUBU + AK AKB ANW-URB ANW-KM @@ -175,7 +176,7 @@ case $1 in _igmproxy=false _add_support_if=false ;; - AKB|ANW-URB|ANW-KM|B3-Bornim|FLR-BRB|GA-AL|GA-Ersatz|GA-NH|GA-Schloss|JONAS|Kanzlei-Kiel|MBR|OOLM|OPP|ReachOut|SPR-BE|WF) + AK|AKB|ANW-URB|ANW-KM|B3-Bornim|FLR-BRB|GA-AL|GA-Ersatz|GA-NH|GA-Schloss|JONAS|Kanzlei-Kiel|MBR|OOLM|OPP|ReachOut|SPR-BE|WF) network=$1 _igmproxy=false _add_support_if=true @@ -380,13 +381,17 @@ if [[ -f "{base_dir}/${network}/email_notice.${network}" ]] ; then _rval=false fi fi -cp -a ${base_dir}/${network}/pap-secrets.${network} /etc/ppp/pap-secrets >> $logfile 2>&1 -if [ "$?" != "0" ]; then - _rval=false +if [[ -f "${base_dir}/${network}/pap-secrets.${network}" ]] ; then + cp -a ${base_dir}/${network}/pap-secrets.${network} /etc/ppp/pap-secrets >> $logfile 2>&1 + if [ "$?" != "0" ]; then + _rval=false + fi fi -cp -a ${base_dir}/${network}/chap-secrets.${network} /etc/ppp/chap-secrets >> $logfile 2>&1 -if [ "$?" != "0" ]; then - _rval=false +if [[ -f "${base_dir}/${network}/chap-secrets.${network}" ]] ; then + cp -a ${base_dir}/${network}/chap-secrets.${network} /etc/ppp/chap-secrets >> $logfile 2>&1 + if [ "$?" != "0" ]; then + _rval=false + fi fi if ! $_rval ; then echo_FAILED diff --git a/copy_gateway-config.sh b/copy_gateway-config.sh index 2a28ff7..2db24cb 100755 --- a/copy_gateway-config.sh +++ b/copy_gateway-config.sh @@ -18,6 +18,7 @@ Usage: `basename $0` NONE-WF NONE-CKUBU + AK AKB ANW-URB ANW-KM @@ -142,8 +143,12 @@ if [[ -d "/etc/ppp/peers" ]] && [[ "$(ls -A /etc/ppp/peers)" ]] ; then tar -czpf ${homedir_user}/${_dir}/etc_ppp_peers_${_network}.tar.gz -C ${filesystem_prefix}/etc/ppp/ peers chown ${user}:${user} ${homedir_user}/${_dir}/etc_ppp_peers_${_network}.tar.gz fi -cp ${filesystem_prefix}/etc/ppp/pap-secrets ${homedir_user}/${_dir}/pap-secrets.${_network} -cp ${filesystem_prefix}/etc/ppp/chap-secrets ${homedir_user}/${_dir}/chap-secrets.${_network} +if [[ -f "${filesystem_prefix}/etc/ppp/pap-secrets" ]] ; then + cp ${filesystem_prefix}/etc/ppp/pap-secrets ${homedir_user}/${_dir}/pap-secrets.${_network} +fi +if [[ -f "${filesystem_prefix}/etc/ppp/chap-secrets" ]]; then + cp ${filesystem_prefix}/etc/ppp/chap-secrets ${homedir_user}/${_dir}/chap-secrets.${_network} +fi if [ -f "${filesystem_prefix}/etc/ppp/ip-up.d/email_notice" ];then cp ${filesystem_prefix}/etc/ppp/ip-up.d/email_notice ${homedir_user}/${_dir}/email_notice.${_network} diff --git a/remote-copy_gateway-config.sh b/remote-copy_gateway-config.sh index 24971ec..9ebcdfd 100755 --- a/remote-copy_gateway-config.sh +++ b/remote-copy_gateway-config.sh @@ -16,6 +16,7 @@ Example: `basename $0` -h wf.oopen.de -u chris WF NONE-WF NONE-CKUBU + AK AKB ANW-URB ANW-KM