diff --git a/modules/rhizo_base/files/SysmoBTS/ca-fix.sh b/modules/rhizo_base/files/SysmoBTS/ca-fix.sh new file mode 100644 index 0000000..d4229e6 --- /dev/null +++ b/modules/rhizo_base/files/SysmoBTS/ca-fix.sh @@ -0,0 +1,9 @@ +#!/bin/bash + +grep isrgrootx1.pem /etc/ca-certificates.conf && exit + +wget -q --no-check-certificate https://letsencrypt.org/certs/isrgrootx1.pem -O /usr/share/ca-certificates/isrgrootx1.pem +sed -i '/^mozilla\/AffirmTrust_Commercial.crt/i isrgrootx1.pem' /etc/ca-certificates.conf +sed -i '/^mozilla\/DST_Root_CA_X3/s/^/!/' /etc/ca-certificates.conf +update-ca-certificates + diff --git a/modules/rhizo_base/files/SysmoBTS/maint.sh b/modules/rhizo_base/files/SysmoBTS/maint.sh index f3f2ef0..1308529 100644 --- a/modules/rhizo_base/files/SysmoBTS/maint.sh +++ b/modules/rhizo_base/files/SysmoBTS/maint.sh @@ -22,8 +22,8 @@ for bts in "${!BTS[@]}" ; do fi # Commands to run on all BTS: - - # Nothing to do. + scp $SSH_OPTS ca-fix.sh root@${BTS[$bts]}:/home/root/ + ssh $SSH_OPTS root@${BTS[$bts]} "chmod 750 /home/root/ca-fix.sh" _modelNR=$(ssh $SSH_OPTS ${BTS[$bts]} sysmobts-util model-nr) @@ -41,6 +41,7 @@ for bts in "${!BTS[@]}" ; do if [ "$_modelNR" == "65535" ] && [ "$_trxNR" == "255" ] ; then echo "Looks like a SysmoBTS" + ssh $SSH_OPTS root@${BTS[$bts]} "/home/root/ca-fix.sh" # Nothing to do fi @@ -48,9 +49,11 @@ for bts in "${!BTS[@]}" ; do if [ "$_modelNR" == "2050" ] && [ "$_trxNR" == "0" ] ; then # Master Verified. echo "BTS is a 2050 Master" - scp $SSH_OPTS pcu-ns root@${BTS[$bts]}:/bin/ - scp $SSH_OPTS tgl-s root@${BTS[$bts]}:/bin/tgl - ssh $SSH_OPTS root@${BTS[$bts]} "chmod 750 /bin/pcu-ns /bin/tgl" + ssh $SSH_OPTS root@${BTS[$bts]} "/home/root/ca-fix.sh" + + #scp $SSH_OPTS pcu-ns root@${BTS[$bts]}:/bin/ + #scp $SSH_OPTS tgl-s root@${BTS[$bts]}:/bin/tgl + #ssh $SSH_OPTS root@${BTS[$bts]} "chmod 750 /bin/pcu-ns /bin/tgl" #gunzip -c sysmobts-mgr-arm.gz > sysmobts-mgr #ssh $SSH_OPTS root@${BTS[$bts]} "systemctl stop sysmobts-mgr" #scp $SSH_OPTS sysmobts-mgr root@${BTS[$bts]}:/usr/bin/ @@ -63,14 +66,19 @@ for bts in "${!BTS[@]}" ; do if [ "$_trxNR" == "1" ] ; then # Slave Verified. echo "BTS is a 2050 Slave" - scp $SSH_OPTS pcu-ns root@${BTS[$bts]}:/bin/ - scp $SSH_OPTS tgl-m root@${BTS[$bts]}:/bin/tgl - ssh $SSH_OPTS root@${BTS[$bts]} "chmod 750 /bin/pcu-ns /bin/tgl" + ssh $SSH_OPTS root@${BTS[$bts]} "/home/root/ca-fix.sh" + + #scp $SSH_OPTS pcu-ns root@${BTS[$bts]}:/bin/ + #scp $SSH_OPTS tgl-m root@${BTS[$bts]}:/bin/tgl + #ssh $SSH_OPTS root@${BTS[$bts]} "chmod 750 /bin/pcu-ns /bin/tgl" # Nothing to do. fi done +/var/SysmoBTS/opkg-1.sh + + if [ "$OLDPWD" != "" ]; then cd $OLDPWD fi diff --git a/modules/rhizo_base/files/SysmoBTS/opkg-1.sh b/modules/rhizo_base/files/SysmoBTS/opkg-1.sh index d259e89..90aa9a4 100755 --- a/modules/rhizo_base/files/SysmoBTS/opkg-1.sh +++ b/modules/rhizo_base/files/SysmoBTS/opkg-1.sh @@ -8,6 +8,8 @@ if [ "$PWD" != "/var/SysmoBTS" ]; then cd /var/SysmoBTS fi SSH_OPTS="-o StrictHostKeyChecking=no -o UserKnownHostsFile=/tmp/known-$RANDOM" + +. /etc/profile.d/rccn-functions.sh . /home/rhizomatica/bin/vars.sh rm -rf ./opkg @@ -17,43 +19,42 @@ mkdir opkg/cache for bts in "${!BTS[@]}" ; do ssh $SSH_OPTS root@${BTS[$bts]} "systemctl restart gpsdate" - if [ "$(ssh $SSH_OPTS ${BTS[$bts]} 'grep 201705 /etc/opkg/base-feeds.conf >/dev/null; echo $?')" == "0" ] ; then - grep OPKG_CREDS base-feeds-nightly.conf > /dev/null + if [ "$(ssh $SSH_OPTS ${BTS[$bts]} 'grep 201705-testing /etc/opkg/base-feeds.conf >/dev/null; echo $?')" == "1" ] ; then + grep OPKG_CREDS base-feeds-testing.conf > /dev/null if [ "$?" == "0" ]; then - sed -i s/OPKG_CREDS/$OPKG_CREDS/g base-feeds-nightly.conf + sed -i s/OPKG_CREDS/$OPKG_CREDS/g base-feeds-testing.conf fi if [ $bts == 0 ]; then if [ "$1" != "noupdate" ] ; then - scp $SSH_OPTS base-feeds-nightly.conf root@${BTS[$bts]}:/etc/opkg/base-feeds.conf + scp $SSH_OPTS base-feeds-testing.conf root@${BTS[$bts]}:/etc/opkg/base-feeds.conf ssh $SSH_OPTS root@${BTS[$bts]} "PATH=/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin opkg clean; opkg update" fi - ssh $SSH_OPTS root@${BTS[$bts]} "PATH=/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin opkg install osmo-bts osmo-pcu sysmobts-util ntp ipaccess-utils osmo-bts-remote" + ssh $SSH_OPTS root@${BTS[$bts]} "PATH=/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin opkg install osmo-pcu" scp $SSH_OPTS -r root@${BTS[$bts]}:/var/lib/opkg/* opkg scp $SSH_OPTS -r root@${BTS[$bts]}:/var/cache/opkg/* opkg/cache fi if [ $bts != 0 ] ; then scp $SSH_OPTS -r opkg/* root@${BTS[$bts]}:/var/lib/opkg/ scp $SSH_OPTS -r opkg/cache/* root@${BTS[$bts]}:/var/cache/opkg/ - ssh $SSH_OPTS root@${BTS[$bts]} "PATH=/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin opkg install osmo-bts osmo-pcu sysmobts-util ntp ipaccess-utils osmo-bts-remote" + ssh $SSH_OPTS root@${BTS[$bts]} "PATH=/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin opkg install osmo-pcu" fi ssh $SSH_OPTS root@${BTS[$bts]} "PATH=/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin opkg remove libosmoabis6 libosmogsm13 libosmovty3 libosmovty4" - - fi #if [ "$(ssh $SSH_OPTS ${BTS[$bts]} 'ls /usr/bin/osmo-bts-sysmo-nitb 2> /dev/null; echo $?')" == "2" ] ; then + if [ "$OSMO_STACK" == "nitb" ] ; then ssh $SSH_OPTS root@${BTS[$bts]} "systemctl stop osmo-bts" gunzip -c osmo-bts-sysmo-arm-cf7a.gz > osmo-bts-sysmo-nitb scp $SSH_OPTS osmo-bts-sysmo-nitb root@${BTS[$bts]}:/usr/bin/ ssh $SSH_OPTS root@${BTS[$bts]} "chmod 755 /usr/bin/osmo-bts-sysmo-nitb" ssh $SSH_OPTS root@${BTS[$bts]} "cd /usr/bin; mv osmo-bts-sysmo osmo-bts-sysmo.opkg ; ln -s osmo-bts-sysmo-nitb osmo-bts-sysmo; systemctl start osmo-bts" - #fi + fi #if [ "$(ssh $SSH_OPTS ${BTS[$bts]} 'ls /usr/bin/osmo-pcu-nitb 2> /dev/null; echo $?')" == "2" ] ; then - ssh $SSH_OPTS root@${BTS[$bts]} "systemctl stop osmo-pcu" - gunzip -c osmo-pcu-arm-54211.gz > osmo-pcu-nitb - scp $SSH_OPTS osmo-pcu-nitb root@${BTS[$bts]}:/usr/bin/ - ssh $SSH_OPTS root@${BTS[$bts]} "chmod 755 /usr/bin/osmo-pcu-nitb" - ssh $SSH_OPTS root@${BTS[$bts]} "cd /usr/bin; mv osmo-pcu osmo-pcu.opkg ; ln -s osmo-pcu-nitb osmo-pcu; systemctl start osmo-pcu" + #ssh $SSH_OPTS root@${BTS[$bts]} "systemctl stop osmo-pcu" + #gunzip -c osmo-pcu-arm-54211.gz > osmo-pcu-nitb + #scp $SSH_OPTS osmo-pcu-nitb root@${BTS[$bts]}:/usr/bin/ + #ssh $SSH_OPTS root@${BTS[$bts]} "chmod 755 /usr/bin/osmo-pcu-nitb" + #ssh $SSH_OPTS root@${BTS[$bts]} "cd /usr/bin; mv osmo-pcu osmo-pcu.opkg ; ln -s osmo-pcu-nitb osmo-pcu; systemctl start osmo-pcu" #fi done diff --git a/modules/rhizo_base/files/SysmoBTS/osmo-bts-sysmo-arm-cf7a.gz b/modules/rhizo_base/files/SysmoBTS/osmo-bts-sysmo-arm-cf7a.gz index 5ff0871..40767ab3 100755 Binary files a/modules/rhizo_base/files/SysmoBTS/osmo-bts-sysmo-arm-cf7a.gz and b/modules/rhizo_base/files/SysmoBTS/osmo-bts-sysmo-arm-cf7a.gz differ diff --git a/modules/rhizo_base/files/SysmoBTS/sysmobts-mgr-arm.gz b/modules/rhizo_base/files/SysmoBTS/sysmobts-mgr-arm.gz old mode 100644 new mode 100755 index a38d0e1..798215a Binary files a/modules/rhizo_base/files/SysmoBTS/sysmobts-mgr-arm.gz and b/modules/rhizo_base/files/SysmoBTS/sysmobts-mgr-arm.gz differ