server_id

install.sh

@@ -33,20 +33,31 @@ then
 else
  echo "file not found"
 fi
+cd /
 if [ -f "/opt/FreeDMR/config/FreeDMR.cfg" ]
 then
-   variable=$(grep "SERVER_ID:" /opt/FreeDMR/config/FreeDMR.cfg | grep -Eo '[0-9]{1,9}')
+   SERVER_ID=$(grep "SERVER_ID:" /opt/FreeDMR/config/FreeDMR.cfg | grep -Eo '[0-9]{1,9}')
 fi
 if [ -f "/opt/adn-server/config/adn.cfg" ]
 then
-   variable=$(grep "SERVER_ID:" /opt/adn-server/config/adn.cfg | grep -Eo '[0-9]{1,9}')
+   SERVER_ID=$(grep "SERVER_ID:" /opt/ADN-DMR-Peer-Server/config/adn.cfg | grep -Eo '[0-9]{1,9}')
+   URL_SECURITY=$(grep "URL_SECURITY:" /opt/ADN-DMR-Peer-Server/config/adn.cfg | grep -oP '(?<=URL_SECURITY:\s).*')
+   PORT_SECURITY=$(grep "PORT_SECURITY:" /opt/ADN-DMR-Peer-Server/config/adn.cfg | grep -Eo '[0-9]{1,5}')
+   PASS_SECURITY=$(grep "PASS_SECURITY:" /opt/ADN-DMR-Peer-Server/config/adn.cfg | grep -oP '(?<=PASS_SECURITY:\s).*')
+   USERS_PASS=$(grep "USERS_PASS:" /opt/ADN-DMR-Peer-Server/config/adn.cfg | grep -oP '(?<=USERS_PASS:\s).*')
+   HASH_ENCRYPT=$(grep "HASH_ENCRYPT:" /opt/ADN-DMR-Peer-Server/config/adn.cfg | grep -oP '(?<=HASH_ENCRYPT:\s).*')
 fi
 if [ -f "/opt/ADN-DMR-Peer-Server/config/adn.cfg" ]
 then
-   variable=$(grep "SERVER_ID:" /opt/ADN-DMR-Peer-Server/config/adn.cfg | grep -Eo '[0-9]{1,9}')
+   SERVER_ID=$(grep "SERVER_ID:" /opt/ADN-DMR-Peer-Server/config/adn.cfg | grep -Eo '[0-9]{1,9}')
+   URL_SECURITY=$(grep "URL_SECURITY:" /opt/ADN-DMR-Peer-Server/config/adn.cfg | grep -oP '(?<=URL_SECURITY:\s).*')
+   PORT_SECURITY=$(grep "PORT_SECURITY:" /opt/ADN-DMR-Peer-Server/config/adn.cfg | grep -Eo '[0-9]{1,5}')
+   PASS_SECURITY=$(grep "PASS_SECURITY:" /opt/ADN-DMR-Peer-Server/config/adn.cfg | grep -oP '(?<=PASS_SECURITY:\s).*')
+   USERS_PASS=$(grep "USERS_PASS:" /opt/ADN-DMR-Peer-Server/config/adn.cfg | grep -oP '(?<=USERS_PASS:\s).*')
+   HASH_ENCRYPT=$(grep "HASH_ENCRYPT:" /opt/ADN-DMR-Peer-Server/config/adn.cfg | grep -oP '(?<=HASH_ENCRYPT:\s).*')
 fi
-if [ -z "$variable" ]
-then variable=0000
+if [ -z "$SERVER_ID" ]
+    then SERVER_ID=0000
 fi
 
 SERVICIOS="adn-server.service freedmr.service proxy.service adn-parrot.service fdmrparrot.service adn_server.service adn_proxy.service adn_parrot.service adn_dashboard"
@@ -277,8 +288,16 @@ sudo chmod -R +x /opt/ADN-DMR-Peer-Server/*
 sudo chmod -R 777 /opt/ADN-DMR-Peer-Server/*
 #./install.sh
 cp /opt/ADN-DMR-Peer-Server/config/ADN-SAMPLE.cfg  /opt/ADN-DMR-Peer-Server/config/adn.cfg
-sed -i "s/SERVER_ID:.*/SERVER_ID: $variable/g"  /opt/ADN-DMR-Peer-Server/config/adn.cfg
-cat /opt/obp.txt >> /opt/ADN-DMR-Peer-Server/config/adn.cfg
+sudo sed -i "s|SERVER_ID:.*|SERVER_ID: $SERVER_ID|g" /opt/ADN-DMR-Peer-Server/config/adn.cfg
+sudo sed -i "s|URL_SECURITY:.*|URL_SECURITY: $URL_SECURITY|g" /opt/ADN-DMR-Peer-Server/config/adn.cfg
+sudo sed -i "s|PORT_SECURITY:.*|PORT_SECURITY: $PORT_SECURITY|g" /opt/ADN-DMR-Peer-Server/config/adn.cfg
+sudo sed -i "s|PASS_SECURITY:.*|PASS_SECURITY: $PASS_SECURITY|g" /opt/ADN-DMR-Peer-Server/config/adn.cfg
+sudo sed -i "s|USERS_PASS:.*|USERS_PASS: $USERS_PASS|g" /opt/ADN-DMR-Peer-Server/config/adn.cfg
+sudo sed -i "s|HASH_ENCRYPT:.*|HASH_ENCRYPT: $HASH_ENCRYPT|g" /opt/ADN-DMR-Peer-Server/config/adn.cfg
+sed -i "/^\[SYSTEM\]/,/^\[/ s|^PASSPHRASE:.*|PASSPHRASE: passw0rd|" /opt/ADN-DMR-Peer-Server/config/adn.cfg
+sed -i "/^\[D-APRS\]/,/^\[/ s|^PASSPHRASE:.*|PASSPHRASE: passw0rd|" /opt/ADN-DMR-Peer-Server/config/adn.cfg
+sed -i "/^\[ECHO\]/,/^\[/ s|^PASSPHRASE:.*|PASSPHRASE: passw0rd|" /opt/ADN-DMR-Peer-Server/config/adn.cfg
+sudo cat /opt/obp.txt >> /opt/ADN-DMR-Peer-Server/config/adn.cfg
 #
 cd /opt/ADN-DMR-Peer-Server/
 #############

update.sh

@@ -378,8 +378,7 @@ then
    HASH_ENCRYPT=$(grep "HASH_ENCRYPT:" /opt/ADN-DMR-Peer-Server/config/adn.cfg | grep -oP '(?<=HASH_ENCRYPT:\s).*')
 fi
 if [ -z "$SERVER_ID" ]
-then SERVER_ID=0000
-
+    then SERVER_ID=0000
 fi
 SERVICIOS="adn-server.service freedmr.service proxy.service adn-parrot.service fdmrparrot.service adn_server.service adn_proxy.service adn_parrot.service"