diff --git a/src/freedombone b/src/freedombone index 6f6a4ae0..195fa63a 100755 --- a/src/freedombone +++ b/src/freedombone @@ -405,8 +405,11 @@ TOX_NODE= ZERONET_REPO='https://github.com/bashrc/ZeroNet.git' ZERONET_BLOG_REPO='https://github.com/HelloZeroNet/ZeroBlog' ZERONET_FORUM_REPO='https://github.com/HelloZeroNet/ZeroTalk' +ZERONET_URL=http://127.0.0.1:43110 ZERONET_PORT=15441 TRACKER_PORT=6969 +ZERONET_DEFAULT_BLOG_TAGLINE="Blogging on the Mesh" +ZERONET_DEFAULT_FORUM_TAGLINE="A decentralized discussion group" # Default diffie-hellman key length in bits DH_KEYLENGTH=1024 @@ -1637,6 +1640,8 @@ function install_zeronet_blog { exit 736 fi + ZERONET_DEFAULT_BLOG_TITLE="${MY_USERNAME}'s Blog" + cd /opt/zeronet python zeronet.py --batch siteCreate 2> /opt/zeronet/blog.txt if [ ! -f /opt/zeronet/blog.txt ]; then @@ -1736,6 +1741,8 @@ function install_zeronet_forum { exit 736 fi + ZERONET_DEFAULT_FORUM_TITLE="${MY_USERNAME}'s Forum" + cd /opt/zeronet python zeronet.py --batch siteCreate 2> /opt/zeronet/forum.txt if [ ! -f /opt/zeronet/forum.txt ]; then diff --git a/src/freedombone-meshweb b/src/freedombone-meshweb index 6a6a1117..9eb3d4bb 100755 --- a/src/freedombone-meshweb +++ b/src/freedombone-meshweb @@ -17,9 +17,7 @@ TRACKER_PORT=6969 MY_USERNAME=$USER ZERONET_DIR=/home/$MY_USERNAME/zeronet UPDATED="no" -ZERONET_DEFAULT_BLOG_TITLE="$(hostname)'s Blog" ZERONET_DEFAULT_BLOG_TAGLINE="Blogging on the Mesh" -ZERONET_DEFAULT_FORUM_TITLE="$(hostname)'s Forum" ZERONET_DEFAULT_FORUM_TAGLINE="A decentralized discussion group" function install_zeronet_blog { @@ -36,6 +34,8 @@ function install_zeronet_blog { exit 736 fi + ZERONET_DEFAULT_BLOG_TITLE="${MY_USERNAME}'s Blog" + cd $ZERONET_DIR python zeronet.py --batch siteCreate 2> $ZERONET_DIR/blog.txt if [ ! -f $ZERONET_DIR/blog.txt ]; then @@ -127,6 +127,8 @@ function install_zeronet_forum { exit 736 fi + ZERONET_DEFAULT_FORUM_TITLE="${MY_USERNAME}'s Forum" + cd $ZERONET_DIR python zeronet.py --batch siteCreate 2> $ZERONET_DIR/forum.txt if [ ! -f $ZERONET_DIR/forum.txt ]; then @@ -242,10 +244,10 @@ function install_zeronet { fi cd $ZERONET_DIR git checkout bashrc/bootstrap-file - # Hack to ensure that the file access port is opened + # Hack to ensure that the file access port is opened # This is because zeronet normally relies on an internet site # to do this, but on a purely local mesh the internet isn't available - sed -i 's|fileserver_port = 0|fileserver_port = config.fileserver_port + sed -i 's|fileserver_port = 0|fileserver_port = config.fileserver_port sys.modules["main"].file_server.port_opened = True|g' $ZERONET_DIR/src/Site/Site.py }