free
/
freedomboneeee
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Default zeronet service names

This commit is contained in:
Bob Mottram 2015-09-04 12:27:33 +01:00
parent f6b2e33178
commit 8b9c885c5a
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/freedombone
View File

@ -405,8 +405,11 @@ TOX_NODE=
ZERONET_REPO='https://github.com/bashrc/ZeroNet.git' ZERONET_REPO='https://github.com/bashrc/ZeroNet.git'
ZERONET_BLOG_REPO='https://github.com/HelloZeroNet/ZeroBlog' ZERONET_BLOG_REPO='https://github.com/HelloZeroNet/ZeroBlog'
ZERONET_FORUM_REPO='https://github.com/HelloZeroNet/ZeroTalk' ZERONET_FORUM_REPO='https://github.com/HelloZeroNet/ZeroTalk'
ZERONET_URL=http://127.0.0.1:43110
ZERONET_PORT=15441 ZERONET_PORT=15441
TRACKER_PORT=6969 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 # Default diffie-hellman key length in bits
DH_KEYLENGTH=1024 DH_KEYLENGTH=1024
@ -1637,6 +1640,8 @@ function install_zeronet_blog {
exit 736 exit 736
fi fi
ZERONET_DEFAULT_BLOG_TITLE="${MY_USERNAME}'s Blog"
cd /opt/zeronet cd /opt/zeronet
python zeronet.py --batch siteCreate 2> /opt/zeronet/blog.txt python zeronet.py --batch siteCreate 2> /opt/zeronet/blog.txt
if [ ! -f /opt/zeronet/blog.txt ]; then if [ ! -f /opt/zeronet/blog.txt ]; then
@ -1736,6 +1741,8 @@ function install_zeronet_forum {
exit 736 exit 736
fi fi
ZERONET_DEFAULT_FORUM_TITLE="${MY_USERNAME}'s Forum"
cd /opt/zeronet cd /opt/zeronet
python zeronet.py --batch siteCreate 2> /opt/zeronet/forum.txt python zeronet.py --batch siteCreate 2> /opt/zeronet/forum.txt
if [ ! -f /opt/zeronet/forum.txt ]; then if [ ! -f /opt/zeronet/forum.txt ]; then

10
src/freedombone-meshweb
View File

@ -17,9 +17,7 @@ TRACKER_PORT=6969
MY_USERNAME=$USER MY_USERNAME=$USER
ZERONET_DIR=/home/$MY_USERNAME/zeronet ZERONET_DIR=/home/$MY_USERNAME/zeronet
UPDATED="no" UPDATED="no"
ZERONET_DEFAULT_BLOG_TITLE="$(hostname)'s Blog"
ZERONET_DEFAULT_BLOG_TAGLINE="Blogging on the Mesh" ZERONET_DEFAULT_BLOG_TAGLINE="Blogging on the Mesh"
ZERONET_DEFAULT_FORUM_TITLE="$(hostname)'s Forum"
ZERONET_DEFAULT_FORUM_TAGLINE="A decentralized discussion group" ZERONET_DEFAULT_FORUM_TAGLINE="A decentralized discussion group"
function install_zeronet_blog { function install_zeronet_blog {
@ -36,6 +34,8 @@ function install_zeronet_blog {
exit 736 exit 736
fi fi
ZERONET_DEFAULT_BLOG_TITLE="${MY_USERNAME}'s Blog"
cd $ZERONET_DIR cd $ZERONET_DIR
python zeronet.py --batch siteCreate 2> $ZERONET_DIR/blog.txt python zeronet.py --batch siteCreate 2> $ZERONET_DIR/blog.txt
if [ ! -f $ZERONET_DIR/blog.txt ]; then if [ ! -f $ZERONET_DIR/blog.txt ]; then
@ -127,6 +127,8 @@ function install_zeronet_forum {
exit 736 exit 736
fi fi
ZERONET_DEFAULT_FORUM_TITLE="${MY_USERNAME}'s Forum"
cd $ZERONET_DIR cd $ZERONET_DIR
python zeronet.py --batch siteCreate 2> $ZERONET_DIR/forum.txt python zeronet.py --batch siteCreate 2> $ZERONET_DIR/forum.txt
if [ ! -f $ZERONET_DIR/forum.txt ]; then if [ ! -f $ZERONET_DIR/forum.txt ]; then
@ -242,10 +244,10 @@ function install_zeronet {
fi fi
cd $ZERONET_DIR cd $ZERONET_DIR
git checkout bashrc/bootstrap-file 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 # This is because zeronet normally relies on an internet site
# to do this, but on a purely local mesh the internet isn't available # 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 sys.modules["main"].file_server.port_opened = True|g' $ZERONET_DIR/src/Site/Site.py
} }