Преглед изворни кода

Reinstall tlsdate if needed

Bob Mottram пре 9 година
родитељ
комит
47506d8488
1 измењених фајлова са 28 додато и 2 уклоњено
  1. 28
    2
      src/freedombone

+ 28
- 2
src/freedombone Прегледај датотеку

6595
       return
6595
       return
6596
   fi
6596
   fi
6597
 
6597
 
6598
+  # remove any previous version of tlsdate compiled from source
6599
+  reinstall_tlsdate="no"
6600
+  if [ -d $INSTALL_DIR/tlsdate ]; then
6601
+      if [ -f /usr/bin/tlsdate ]; then
6602
+          echo 'Removing previous tlsdate install'
6603
+          rm -rf $INSTALL_DIR/tlsdate
6604
+          rm -f /usr/bin/tlsdate
6605
+          reinstall_tlsdate="yes"
6606
+          echo 'Reinstalling tlsdate'
6607
+      fi
6608
+  fi
6609
+
6598
   if grep -Fxq "time_synchronisation" $COMPLETION_FILE; then
6610
   if grep -Fxq "time_synchronisation" $COMPLETION_FILE; then
6599
-      return
6611
+      if [[ $reinstall_tlsdate == "no" ]]; then
6612
+          return
6613
+      fi
6600
   fi
6614
   fi
6601
 
6615
 
6602
   apt-get -y install tlsdate
6616
   apt-get -y install tlsdate
6607
   echo "TIMESOURCE2='${TLS_TIME_SOURCE2}'" >> /usr/bin/updatedate
6621
   echo "TIMESOURCE2='${TLS_TIME_SOURCE2}'" >> /usr/bin/updatedate
6608
   echo 'LOGFILE=/var/log/tlsdate.log' >> /usr/bin/updatedate
6622
   echo 'LOGFILE=/var/log/tlsdate.log' >> /usr/bin/updatedate
6609
   echo 'TIMEOUT=5' >> /usr/bin/updatedate
6623
   echo 'TIMEOUT=5' >> /usr/bin/updatedate
6610
-  echo "EMAIL=$MY_EMAIL_ADDRESS" >> /usr/bin/updatedate
6624
+  echo 'if grep -q "Admin user" $COMPLETION_FILE; then' >> /usr/bin/updatedate
6625
+  echo -n '    ADMIN_USER=$(cat $COMPLETION_FILE | grep "Admin user" | ' >> /usr/bin/updatedate
6626
+  echo -n "awk -F ':' '{print " >> /usr/bin/updatedate
6627
+  echo -n '$2' >> /usr/bin/updatedate
6628
+  echo "}')" >> /usr/bin/updatedate
6629
+  echo '    EMAIL=$ADMIN_USER@$HOSTNAME' >> /usr/bin/updatedate
6630
+  echo 'else' >> /usr/bin/updatedate
6631
+  echo "    EMAIL=$MY_EMAIL_ADDRESS" >> /usr/bin/updatedate
6632
+  echo 'fi' >> /usr/bin/updatedate
6611
   echo '# File which contains the previous date as a number' >> /usr/bin/updatedate
6633
   echo '# File which contains the previous date as a number' >> /usr/bin/updatedate
6612
   echo 'BEFORE_DATE_FILE=/var/log/tlsdateprevious.txt' >> /usr/bin/updatedate
6634
   echo 'BEFORE_DATE_FILE=/var/log/tlsdateprevious.txt' >> /usr/bin/updatedate
6613
   echo '# File which contains the previous date as a string' >> /usr/bin/updatedate
6635
   echo '# File which contains the previous date as a string' >> /usr/bin/updatedate
6677
   echo '*/15           * *   *   *   root /usr/bin/updatedate' >> /etc/crontab
6699
   echo '*/15           * *   *   *   root /usr/bin/updatedate' >> /etc/crontab
6678
   service cron restart
6700
   service cron restart
6679
 
6701
 
6702
+  if [[ $reinstall_tlsdate != "no" ]]; then
6703
+      echo 'tlsdate was reinstalled'
6704
+  fi
6705
+
6680
   echo 'time_synchronisation' >> $COMPLETION_FILE
6706
   echo 'time_synchronisation' >> $COMPLETION_FILE
6681
 }
6707
 }
6682
 
6708