Procházet zdrojové kódy

Peg mesh clients to specific commits

Bob Mottram před 9 roky
rodič
revize
6a977fb8f3
1 změnil soubory, kde provedl 13 přidání a 3 odebrání
  1. 13
    3
      src/freedombone-meshweb

+ 13
- 3
src/freedombone-meshweb Zobrazit soubor

@@ -13,11 +13,14 @@ SERVER_INSTALLATION="no"
13 13
 
14 14
 PEERS_FILE=/tmp/meshwebstart
15 15
 
16
-ZERONET_REPO='https://github.com/HelloZeroNet/ZeroNet'
16
+ZERONET_REPO='https://github.com/HelloZeroNet/ZeroNet.git'
17
+ZERONET_COMMIT='675bd462556c541d65e2d95f91f899146a373aad'
17 18
 ZERONET_BLOG_REPO='https://github.com/HelloZeroNet/ZeroBlog'
18
-ZERONET_FORUM_REPO='https://github.com/HelloZeroNet/ZeroTalk'
19
+ZERONET_BLOG_COMMIT='bbb0d6c36465fed2e6df71f1aab45fcc9c6ad609'
19 20
 ZERONET_MAIL_REPO='https://github.com/HelloZeroNet/ZeroMail'
20 21
 ZERONET_MAIL_COMMIT='955af09d643c72b02e4983d71eca5c0c93a6c131'
22
+ZERONET_FORUM_REPO='https://github.com/HelloZeroNet/ZeroTalk'
23
+ZERONET_FORUM_COMMIT='e2d2c9cb1cfbfef91b244935efb5c14c2ad95faa'
21 24
 ZERONET_URL=http://127.0.0.1:43110
22 25
 ZERONET_PORT=15441
23 26
 TRACKER_PORT=6969
@@ -151,6 +154,8 @@ function install_zeronet_blog {
151 154
         echo $'ZeroBlog repo could not be cloned'
152 155
         exit 6739
153 156
     fi
157
+	cd /opt/zeronet/ZeroBlog
158
+	git checkout $ZERONET_BLOG_COMMIT -b $ZERONET_BLOG_COMMIT
154 159
 
155 160
     echo $"Blog address:     $ZERONET_BLOG_ADDRESS"
156 161
     echo $"Blog private key: $ZERONET_BLOG_PRIVATE_KEY"
@@ -340,7 +345,10 @@ function install_zeronet_forum {
340 345
         echo $'ZeroTalk repo could not be cloned'
341 346
         exit 6739
342 347
     fi
343
-    echo $"Forum address:     $ZERONET_FORUM_ADDRESS"
348
+	cd /opt/zeronet/ZeroTalk
349
+	git checkout $ZERONET_FORUM_COMMIT -b $ZERONET_FORUM_COMMIT
350
+
351
+	echo $"Forum address:     $ZERONET_FORUM_ADDRESS"
344 352
     echo $"Forum private key: $ZERONET_FORUM_PRIVATE_KEY"
345 353
     cp -r $ZERONET_DIR/ZeroTalk/* $ZERONET_DIR/data/$ZERONET_FORUM_ADDRESS
346 354
     sed -i "s/ZeroBoard/$ZERONET_DEFAULT_FORUM_TITLE/g" $ZERONET_DIR/data/$ZERONET_FORUM_ADDRESS/index.html
@@ -420,6 +428,8 @@ function install_zeronet {
420 428
     if [ ! -d $ZERONET_DIR ]; then
421 429
         exit 56823
422 430
     fi
431
+	cd $ZERONET_DIR
432
+	git checkout $ZERONET_COMMIT -b $ZERONET_COMMIT
423 433
     #cd $ZERONET_DIR
424 434
     #git checkout bashrc/bootstrap-file
425 435
     # Hack to ensure that the file access port is opened