diff --git a/src/freedombone-meshweb b/src/freedombone-meshweb index be8c5a2a..a896e9e9 100755 --- a/src/freedombone-meshweb +++ b/src/freedombone-meshweb @@ -13,11 +13,14 @@ SERVER_INSTALLATION="no" PEERS_FILE=/tmp/meshwebstart -ZERONET_REPO='https://github.com/HelloZeroNet/ZeroNet' +ZERONET_REPO='https://github.com/HelloZeroNet/ZeroNet.git' +ZERONET_COMMIT='675bd462556c541d65e2d95f91f899146a373aad' ZERONET_BLOG_REPO='https://github.com/HelloZeroNet/ZeroBlog' -ZERONET_FORUM_REPO='https://github.com/HelloZeroNet/ZeroTalk' +ZERONET_BLOG_COMMIT='bbb0d6c36465fed2e6df71f1aab45fcc9c6ad609' ZERONET_MAIL_REPO='https://github.com/HelloZeroNet/ZeroMail' ZERONET_MAIL_COMMIT='955af09d643c72b02e4983d71eca5c0c93a6c131' +ZERONET_FORUM_REPO='https://github.com/HelloZeroNet/ZeroTalk' +ZERONET_FORUM_COMMIT='e2d2c9cb1cfbfef91b244935efb5c14c2ad95faa' ZERONET_URL=http://127.0.0.1:43110 ZERONET_PORT=15441 TRACKER_PORT=6969 @@ -151,6 +154,8 @@ function install_zeronet_blog { echo $'ZeroBlog repo could not be cloned' exit 6739 fi + cd /opt/zeronet/ZeroBlog + git checkout $ZERONET_BLOG_COMMIT -b $ZERONET_BLOG_COMMIT echo $"Blog address: $ZERONET_BLOG_ADDRESS" echo $"Blog private key: $ZERONET_BLOG_PRIVATE_KEY" @@ -340,7 +345,10 @@ function install_zeronet_forum { echo $'ZeroTalk repo could not be cloned' exit 6739 fi - echo $"Forum address: $ZERONET_FORUM_ADDRESS" + cd /opt/zeronet/ZeroTalk + git checkout $ZERONET_FORUM_COMMIT -b $ZERONET_FORUM_COMMIT + + echo $"Forum address: $ZERONET_FORUM_ADDRESS" echo $"Forum private key: $ZERONET_FORUM_PRIVATE_KEY" cp -r $ZERONET_DIR/ZeroTalk/* $ZERONET_DIR/data/$ZERONET_FORUM_ADDRESS sed -i "s/ZeroBoard/$ZERONET_DEFAULT_FORUM_TITLE/g" $ZERONET_DIR/data/$ZERONET_FORUM_ADDRESS/index.html @@ -420,6 +428,8 @@ function install_zeronet { if [ ! -d $ZERONET_DIR ]; then exit 56823 fi + cd $ZERONET_DIR + git checkout $ZERONET_COMMIT -b $ZERONET_COMMIT #cd $ZERONET_DIR #git checkout bashrc/bootstrap-file # Hack to ensure that the file access port is opened