Browse Source

Default zeronet service names

Bob Mottram 9 years ago
parent
commit
8b9c885c5a
2 changed files with 13 additions and 4 deletions
  1. 7
    0
      src/freedombone
  2. 6
    4
      src/freedombone-meshweb

+ 7
- 0
src/freedombone View File

405
 ZERONET_REPO='https://github.com/bashrc/ZeroNet.git'
405
 ZERONET_REPO='https://github.com/bashrc/ZeroNet.git'
406
 ZERONET_BLOG_REPO='https://github.com/HelloZeroNet/ZeroBlog'
406
 ZERONET_BLOG_REPO='https://github.com/HelloZeroNet/ZeroBlog'
407
 ZERONET_FORUM_REPO='https://github.com/HelloZeroNet/ZeroTalk'
407
 ZERONET_FORUM_REPO='https://github.com/HelloZeroNet/ZeroTalk'
408
+ZERONET_URL=http://127.0.0.1:43110
408
 ZERONET_PORT=15441
409
 ZERONET_PORT=15441
409
 TRACKER_PORT=6969
410
 TRACKER_PORT=6969
411
+ZERONET_DEFAULT_BLOG_TAGLINE="Blogging on the Mesh"
412
+ZERONET_DEFAULT_FORUM_TAGLINE="A decentralized discussion group"
410
 
413
 
411
 # Default diffie-hellman key length in bits
414
 # Default diffie-hellman key length in bits
412
 DH_KEYLENGTH=1024
415
 DH_KEYLENGTH=1024
1637
       exit 736
1640
       exit 736
1638
   fi
1641
   fi
1639
 
1642
 
1643
+  ZERONET_DEFAULT_BLOG_TITLE="${MY_USERNAME}'s Blog"
1644
+
1640
   cd /opt/zeronet
1645
   cd /opt/zeronet
1641
   python zeronet.py --batch siteCreate 2> /opt/zeronet/blog.txt
1646
   python zeronet.py --batch siteCreate 2> /opt/zeronet/blog.txt
1642
   if [ ! -f /opt/zeronet/blog.txt ]; then
1647
   if [ ! -f /opt/zeronet/blog.txt ]; then
1736
       exit 736
1741
       exit 736
1737
   fi
1742
   fi
1738
 
1743
 
1744
+  ZERONET_DEFAULT_FORUM_TITLE="${MY_USERNAME}'s Forum"
1745
+
1739
   cd /opt/zeronet
1746
   cd /opt/zeronet
1740
   python zeronet.py --batch siteCreate 2> /opt/zeronet/forum.txt
1747
   python zeronet.py --batch siteCreate 2> /opt/zeronet/forum.txt
1741
   if [ ! -f /opt/zeronet/forum.txt ]; then
1748
   if [ ! -f /opt/zeronet/forum.txt ]; then

+ 6
- 4
src/freedombone-meshweb View File

17
 MY_USERNAME=$USER
17
 MY_USERNAME=$USER
18
 ZERONET_DIR=/home/$MY_USERNAME/zeronet
18
 ZERONET_DIR=/home/$MY_USERNAME/zeronet
19
 UPDATED="no"
19
 UPDATED="no"
20
-ZERONET_DEFAULT_BLOG_TITLE="$(hostname)'s Blog"
21
 ZERONET_DEFAULT_BLOG_TAGLINE="Blogging on the Mesh"
20
 ZERONET_DEFAULT_BLOG_TAGLINE="Blogging on the Mesh"
22
-ZERONET_DEFAULT_FORUM_TITLE="$(hostname)'s Forum"
23
 ZERONET_DEFAULT_FORUM_TAGLINE="A decentralized discussion group"
21
 ZERONET_DEFAULT_FORUM_TAGLINE="A decentralized discussion group"
24
 
22
 
25
 function install_zeronet_blog {
23
 function install_zeronet_blog {
36
         exit 736
34
         exit 736
37
     fi
35
     fi
38
 
36
 
37
+    ZERONET_DEFAULT_BLOG_TITLE="${MY_USERNAME}'s Blog"
38
+
39
     cd $ZERONET_DIR
39
     cd $ZERONET_DIR
40
     python zeronet.py --batch siteCreate 2> $ZERONET_DIR/blog.txt
40
     python zeronet.py --batch siteCreate 2> $ZERONET_DIR/blog.txt
41
     if [ ! -f $ZERONET_DIR/blog.txt ]; then
41
     if [ ! -f $ZERONET_DIR/blog.txt ]; then
127
         exit 736
127
         exit 736
128
     fi
128
     fi
129
 
129
 
130
+    ZERONET_DEFAULT_FORUM_TITLE="${MY_USERNAME}'s Forum"
131
+
130
     cd $ZERONET_DIR
132
     cd $ZERONET_DIR
131
     python zeronet.py --batch siteCreate 2> $ZERONET_DIR/forum.txt
133
     python zeronet.py --batch siteCreate 2> $ZERONET_DIR/forum.txt
132
     if [ ! -f $ZERONET_DIR/forum.txt ]; then
134
     if [ ! -f $ZERONET_DIR/forum.txt ]; then
242
     fi
244
     fi
243
     cd $ZERONET_DIR
245
     cd $ZERONET_DIR
244
     git checkout bashrc/bootstrap-file
246
     git checkout bashrc/bootstrap-file
245
-	# Hack to ensure that the file access port is opened
247
+    # Hack to ensure that the file access port is opened
246
     # This is because zeronet normally relies on an internet site
248
     # This is because zeronet normally relies on an internet site
247
     # to do this, but on a purely local mesh the internet isn't available
249
     # to do this, but on a purely local mesh the internet isn't available
248
-	sed -i 's|fileserver_port = 0|fileserver_port = config.fileserver_port
250
+    sed -i 's|fileserver_port = 0|fileserver_port = config.fileserver_port
249
             sys.modules["main"].file_server.port_opened = True|g' $ZERONET_DIR/src/Site/Site.py
251
             sys.modules["main"].file_server.port_opened = True|g' $ZERONET_DIR/src/Site/Site.py
250
 }
252
 }
251
 
253