diff --git a/dapostinstall.sh b/dapostinstall.sh index 5f1e114..3f67b96 100755 --- a/dapostinstall.sh +++ b/dapostinstall.sh @@ -388,13 +388,21 @@ DA_ADMINPASS=$( DA_OPTIONSCONF=$CBDIR/options.conf DA_USERCONF=$DADIR/data/users/admin/user.conf DA_HOSTNAME=$(hostname -f) -DA_IP=`cat $DA_USERCONF | grep ip= | cut -d= -f2` -DA_NS1=`cat $DA_USERCONF | grep ns1= | cut -d= -f2` -DA_NS2=`cat $DA_USERCONF | grep ns1= | cut -d= -f2` -DA_PHP1=`cat $DA_OPTIONSCONF | grep php1_release= | cut -d= -f2` -DA_PHP2=`cat $DA_OPTIONSCONF | grep php2_release= | cut -d= -f2` -DA_PHP3=`cat $DA_OPTIONSCONF | grep php3_release= | cut -d= -f2` -DA_PHP4=`cat $DA_OPTIONSCONF | grep php4_release= | cut -d= -f2` + +DA_IP=$(cat "$DA_USERCONF" | grep 'ip=' | cut -d= -f2) +DA_NS1=$(cat "$DA_USERCONF" | grep 'ns1=' | cut -d= -f2) +DA_NS2=$(cat "$DA_USERCONF" | grep 'ns2=' | cut -d= -f2) + +DA_PHP1=$(cat "$DA_OPTIONSCONF" | grep 'php1_release=' | cut -d= -f2) +DA_PHP2=$(cat "$DA_OPTIONSCONF" | grep 'php2_release=' | cut -d= -f2) +DA_PHP3=$(cat "$DA_OPTIONSCONF" | grep 'php3_release=' | cut -d= -f2) +DA_PHP4=$(cat "$DA_OPTIONSCONF" | grep 'php4_release=' | cut -d= -f2) +DA_PHP5=$(cat "$DA_OPTIONSCONF" | grep 'php5_release=' | cut -d= -f2) +DA_PHP6=$(cat "$DA_OPTIONSCONF" | grep 'php6_release=' | cut -d= -f2) +DA_PHP7=$(cat "$DA_OPTIONSCONF" | grep 'php7_release=' | cut -d= -f2) +DA_PHP8=$(cat "$DA_OPTIONSCONF" | grep 'php8_release=' | cut -d= -f2) +DA_PHP9=$(cat "$DA_OPTIONSCONF" | grep 'php9_release=' | cut -d= -f2) + sed -i 's/DA_HOSTNAME/'"$DA_HOSTNAME"'/g' mail_powitalny.txt sed -i 's/DA_HOSTNAME/'"$DA_HOSTNAME"'/g' options.conf sed -i 's/DA_IP/'"$DA_IP"'/g' mail_powitalny.txt @@ -402,12 +410,20 @@ sed -i 's/DA_NS1/'"$DA_NS1"'/g' mail_powitalny.txt sed -i 's/DA_NS2/'"$DA_NS2"'/g' mail_powitalny.txt sed -i 's/DA_HASLO/'"$DA_ADMINPASS"'/g' mail_powitalny.txt sed -i 's/SSH_PORT/'"$SSH_PORT"'/g' mail_powitalny.txt + sed -i 's/DA_PHP1/'"$DA_PHP1"'/g' mail_powitalny.txt sed -i 's/DA_PHP2/'"$DA_PHP2"'/g' mail_powitalny.txt sed -i 's/DA_PHP3/'"$DA_PHP3"'/g' mail_powitalny.txt sed -i 's/DA_PHP4/'"$DA_PHP4"'/g' mail_powitalny.txt +sed -i 's/DA_PHP5/'"$DA_PHP5"'/g' mail_powitalny.txt +sed -i 's/DA_PHP6/'"$DA_PHP6"'/g' mail_powitalny.txt +sed -i 's/DA_PHP7/'"$DA_PHP7"'/g' mail_powitalny.txt +sed -i 's/DA_PHP8/'"$DA_PHP8"'/g' mail_powitalny.txt +sed -i 's/DA_PHP9/'"$DA_PHP9"'/g' mail_powitalny.txt + mv mail_powitalny.txt /root + echo "instalacja SpamBlocker" cd $CBDIR ./build update