|
@@ -91,6 +91,9 @@ DDNS_USERNAME=
|
91
|
91
|
DDNS_PASSWORD=
|
92
|
92
|
CURRENT_DDNS_DOMAIN=
|
93
|
93
|
|
|
94
|
+TLSDATE_REPO="https://github.com/ioerror/tlsdate.git"
|
|
95
|
+TLSDATE_COMMIT='ae396da167a9e43ce10c2db0956fb2e2b0d400ea'
|
|
96
|
+
|
94
|
97
|
INADYN_REPO="https://github.com/bashrc/inadyn"
|
95
|
98
|
INADYN_COMMIT='fadbe17f520d337dfb8d69ee4bf1fcaa23fce0d6'
|
96
|
99
|
|
|
@@ -864,6 +867,12 @@ function read_configuration {
|
864
|
867
|
if grep -q "IPFS_COMMIT" $CONFIGURATION_FILE; then
|
865
|
868
|
IPFS_COMMIT=$(grep "IPFS_COMMIT" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
|
866
|
869
|
fi
|
|
870
|
+ if grep -q "TLSDATE_REPO" $CONFIGURATION_FILE; then
|
|
871
|
+ TLSDATE_REPO=$(grep "TLSDATE_REPO" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
|
|
872
|
+ fi
|
|
873
|
+ if grep -q "TLSDATE_COMMIT" $CONFIGURATION_FILE; then
|
|
874
|
+ TLSDATE_COMMIT=$(grep "TLSDATE_COMMIT" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
|
|
875
|
+ fi
|
867
|
876
|
if grep -q "GNUSOCIAL_COMMIT" $CONFIGURATION_FILE; then
|
868
|
877
|
GNUSOCIAL_COMMIT=$(grep "GNUSOCIAL_COMMIT" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
|
869
|
878
|
fi
|
|
@@ -6462,13 +6471,38 @@ function set_your_domain_name {
|
6462
|
6471
|
}
|
6463
|
6472
|
|
6464
|
6473
|
function time_synchronisation {
|
6465
|
|
- if grep -Fxq "time_synchronisation" $COMPLETION_FILE; then
|
6466
|
|
- return
|
6467
|
|
- fi
|
6468
|
6474
|
# mesh peers typically don't sync over the internet
|
6469
|
6475
|
if [[ $SYSTEM_TYPE == "$VARIANT_MESH" ]]; then
|
6470
|
6476
|
return
|
6471
|
6477
|
fi
|
|
6478
|
+
|
|
6479
|
+ # update to the next commit
|
|
6480
|
+ if [ -d $INSTALL_DIR/tlsdate ]; then
|
|
6481
|
+ if grep -q "tlsdate commit" $COMPLETION_FILE; then
|
|
6482
|
+ CURRENT_TLSDATE_COMMIT=$(grep "tlsdate commit" $COMPLETION_FILE | awk -F ':' '{print $2}')
|
|
6483
|
+ if [[ "$CURRENT_TLSDATE_COMMIT" != "$TLSDATE_COMMIT" ]]; then
|
|
6484
|
+ cd $INSTALL_DIR/tlsdate
|
|
6485
|
+ git stash
|
|
6486
|
+ git checkout master
|
|
6487
|
+ git pull
|
|
6488
|
+ git checkout $TLSDATE_COMMIT
|
|
6489
|
+ git checkout -b $TLSDATE_COMMIT
|
|
6490
|
+ sed -i "s/tlsdate commit.*/tlsdate commit:$TLSDATE_COMMIT/g" $COMPLETION_FILE
|
|
6491
|
+ ./autogen.sh
|
|
6492
|
+ ./configure
|
|
6493
|
+ make
|
|
6494
|
+ make install
|
|
6495
|
+ cp /usr/local/bin/tlsdate* /usr/bin
|
|
6496
|
+ cp /usr/local/sbin/tlsdate* /usr/bin
|
|
6497
|
+ fi
|
|
6498
|
+ else
|
|
6499
|
+ echo "tlsdate commit:$TLSDATE_COMMIT" >> $COMPLETION_FILE
|
|
6500
|
+ fi
|
|
6501
|
+ fi
|
|
6502
|
+
|
|
6503
|
+ if grep -Fxq "time_synchronisation" $COMPLETION_FILE; then
|
|
6504
|
+ return
|
|
6505
|
+ fi
|
6472
|
6506
|
#apt-get -y install tlsdate
|
6473
|
6507
|
|
6474
|
6508
|
# building tlsdate from source is a workaround because of
|
|
@@ -6479,8 +6513,16 @@ function time_synchronisation {
|
6479
|
6513
|
mkdir $INSTALL_DIR
|
6480
|
6514
|
fi
|
6481
|
6515
|
cd $INSTALL_DIR
|
6482
|
|
- git clone https://github.com/ioerror/tlsdate.git
|
|
6516
|
+ git clone $TLSDATE_REPO
|
6483
|
6517
|
cd $INSTALL_DIR/tlsdate
|
|
6518
|
+ git checkout $TLSDATE_COMMIT
|
|
6519
|
+ git checkout -b $TLSDATE_COMMIT
|
|
6520
|
+ if ! grep -q "tlsdate commit" $COMPLETION_FILE; then
|
|
6521
|
+ echo "tlsdate commit:$TLSDATE_COMMIT" >> $COMPLETION_FILE
|
|
6522
|
+ else
|
|
6523
|
+ sed -i "s/tlsdate commit.*/tlsdate commit:$TLSDATE_COMMIT/g" $COMPLETION_FILE
|
|
6524
|
+ fi
|
|
6525
|
+
|
6484
|
6526
|
./autogen.sh
|
6485
|
6527
|
./configure
|
6486
|
6528
|
make
|