|  | @@ -42,9 +42,6 @@ INSTALL_LOG=/var/log/${PROJECT_NAME}.log
 | 
	
		
			
			| 42 | 42 |  
 | 
	
		
			
			| 43 | 43 |  DEFAULT_USERNAME=fbone
 | 
	
		
			
			| 44 | 44 |  
 | 
	
		
			
			| 45 |  | -ZERONET_URL='http://127.0.0.1:43110'
 | 
	
		
			
			| 46 |  | -ZERONET_PORT=15441
 | 
	
		
			
			| 47 |  | -
 | 
	
		
			
			| 48 | 45 |  GO_VERSION=1.7
 | 
	
		
			
			| 49 | 46 |  
 | 
	
		
			
			| 50 | 47 |  TOX_NODES=
 | 
	
	
		
			
			|  | @@ -68,16 +65,7 @@ TOMB_TOX_SIZE_MB=10
 | 
	
		
			
			| 68 | 65 |  # Tomb containing tox bootstrap
 | 
	
		
			
			| 69 | 66 |  TOMB_TOX_BOOTSTRAP_SIZE_MB=10
 | 
	
		
			
			| 70 | 67 |  
 | 
	
		
			
			| 71 |  | -# Tomb containing zeronet
 | 
	
		
			
			| 72 |  | -TOMB_ZERONET_CONFIG_SIZE_MB=10
 | 
	
		
			
			| 73 |  | -TOMB_ZERONET_DATA_SIZE_MB=32
 | 
	
		
			
			| 74 |  | -
 | 
	
		
			
			| 75 | 68 |  MESH_INSTALL_DIR=/var/lib
 | 
	
		
			
			| 76 |  | -ZERONET_INSTALL=$MESH_INSTALL_DIR/zeronet
 | 
	
		
			
			| 77 |  | -TOX_USERS_FILE=$ZERONET_INSTALL/${PROJECT_NAME}-tox-users.html
 | 
	
		
			
			| 78 |  | -
 | 
	
		
			
			| 79 |  | -# whether to enable zeronet
 | 
	
		
			
			| 80 |  | -ENABLE_ZERONET=
 | 
	
		
			
			| 81 | 69 |  
 | 
	
		
			
			| 82 | 70 |  IPFS_PORT=4001
 | 
	
		
			
			| 83 | 71 |  
 | 
	
	
		
			
			|  | @@ -143,309 +131,6 @@ function change_avahi_name {
 | 
	
		
			
			| 143 | 131 |      echo $"avahi name changed to P${PEER_ID}.local" >> $INSTALL_LOG
 | 
	
		
			
			| 144 | 132 |  }
 | 
	
		
			
			| 145 | 133 |  
 | 
	
		
			
			| 146 |  | -function configure_zeronet {
 | 
	
		
			
			| 147 |  | -    sed -i "s|ExecStart=.*|ExecStart=/usr/bin/python zeronet.py --ip_external P${PEER_ID}.local --trackers_file $MESH_INSTALL_DIR/zeronet/bootstrap|g" /etc/systemd/system/zeronet.service
 | 
	
		
			
			| 148 |  | -    echo $"zeronet daemon updated to P${PEER_ID}.local" >> $INSTALL_LOG
 | 
	
		
			
			| 149 |  | -}
 | 
	
		
			
			| 150 |  | -
 | 
	
		
			
			| 151 |  | -function configure_zeronet_blog {
 | 
	
		
			
			| 152 |  | -    echo $'Updating ZeroNet Blog' >> $INSTALL_LOG
 | 
	
		
			
			| 153 |  | -    ZERONET_DEFAULT_BLOG_TITLE="${MY_USERNAME}'s Blog"
 | 
	
		
			
			| 154 |  | -
 | 
	
		
			
			| 155 |  | -    cd $MESH_INSTALL_DIR/zeronet
 | 
	
		
			
			| 156 |  | -    python zeronet.py --batch siteCreate 2> $MESH_INSTALL_DIR/zeronet/blog.txt
 | 
	
		
			
			| 157 |  | -    if [ ! -f $MESH_INSTALL_DIR/zeronet/blog.txt ]; then
 | 
	
		
			
			| 158 |  | -        echo $'Unable to create ZeroNet blog' >> $INSTALL_LOG
 | 
	
		
			
			| 159 |  | -        exit 7386
 | 
	
		
			
			| 160 |  | -    fi
 | 
	
		
			
			| 161 |  | -    blog_address=$(cat $MESH_INSTALL_DIR/zeronet/blog.txt | grep "Site address" | awk -F ':' '{print $2}')
 | 
	
		
			
			| 162 |  | -    blog_private_key=$(cat $MESH_INSTALL_DIR/zeronet/blog.txt | grep "Site private key" | awk -F ':' '{print $2}')
 | 
	
		
			
			| 163 |  | -    ZERONET_BLOG_ADDRESS=${blog_address//[[:blank:]]/}
 | 
	
		
			
			| 164 |  | -    ZERONET_BLOG_PRIVATE_KEY=${blog_private_key//[[:blank:]]/}
 | 
	
		
			
			| 165 |  | -
 | 
	
		
			
			| 166 |  | -    if [ ${#ZERONET_BLOG_ADDRESS} -lt 20 ]; then
 | 
	
		
			
			| 167 |  | -        echo $"Address:    $ZERONET_BLOG_ADDRESS" >> $INSTALL_LOG
 | 
	
		
			
			| 168 |  | -        echo $"Public key: $ZERONET_BLOG_PRIVATE_KEY" >> $INSTALL_LOG
 | 
	
		
			
			| 169 |  | -        echo $'Unable to create zeronet blog address' >> $INSTALL_LOG
 | 
	
		
			
			| 170 |  | -        exit 7358
 | 
	
		
			
			| 171 |  | -    fi
 | 
	
		
			
			| 172 |  | -
 | 
	
		
			
			| 173 |  | -    if [ ${#ZERONET_BLOG_PRIVATE_KEY} -lt 20 ]; then
 | 
	
		
			
			| 174 |  | -        echo $"Address:    $ZERONET_BLOG_ADDRESS" >> $INSTALL_LOG
 | 
	
		
			
			| 175 |  | -        echo $"Public key: $ZERONET_BLOG_PRIVATE_KEY" >> $INSTALL_LOG
 | 
	
		
			
			| 176 |  | -        echo $'Unable to create zeronet blog private key' >> $INSTALL_LOG
 | 
	
		
			
			| 177 |  | -        exit 1639
 | 
	
		
			
			| 178 |  | -    fi
 | 
	
		
			
			| 179 |  | -
 | 
	
		
			
			| 180 |  | -    if [ ! -d "$MESH_INSTALL_DIR/zeronet/data/$ZERONET_BLOG_ADDRESS" ]; then
 | 
	
		
			
			| 181 |  | -        echo $"Unable to find site directory: $MESH_INSTALL_DIR/zeronet/data/$ZERONET_BLOG_ADDRESS" >> $INSTALL_LOG
 | 
	
		
			
			| 182 |  | -        exit 7638
 | 
	
		
			
			| 183 |  | -    fi
 | 
	
		
			
			| 184 |  | -
 | 
	
		
			
			| 185 |  | -    echo $"ZeroNet Blog address:     $ZERONET_BLOG_ADDRESS" >> $INSTALL_LOG
 | 
	
		
			
			| 186 |  | -    echo $"ZeroNet Blog private key: $ZERONET_BLOG_PRIVATE_KEY" >> $INSTALL_LOG
 | 
	
		
			
			| 187 |  | -    cp -r $MESH_INSTALL_DIR/zeronet/ZeroBlog/* $MESH_INSTALL_DIR/zeronet/data/$ZERONET_BLOG_ADDRESS
 | 
	
		
			
			| 188 |  | -
 | 
	
		
			
			| 189 |  | -    if [ ! -d $MESH_INSTALL_DIR/zeronet/data/$ZERONET_BLOG_ADDRESS/data ]; then
 | 
	
		
			
			| 190 |  | -        mkdir $MESH_INSTALL_DIR/zeronet/data/$ZERONET_BLOG_ADDRESS/data
 | 
	
		
			
			| 191 |  | -    fi
 | 
	
		
			
			| 192 |  | -    cp $MESH_INSTALL_DIR/zeronet/data/$ZERONET_BLOG_ADDRESS/data-default/data.json $MESH_INSTALL_DIR/zeronet/data/$ZERONET_BLOG_ADDRESS/data
 | 
	
		
			
			| 193 |  | -    sed -i "s/MyZeroBlog/$ZERONET_DEFAULT_BLOG_TITLE/g" $MESH_INSTALL_DIR/zeronet/data/$ZERONET_BLOG_ADDRESS/data/data.json
 | 
	
		
			
			| 194 |  | -    sed -i "s/My ZeroBlog./$ZERONET_DEFAULT_BLOG_TAGLINE/g" $MESH_INSTALL_DIR/zeronet/data/$ZERONET_BLOG_ADDRESS/data/data.json
 | 
	
		
			
			| 195 |  | -    sed -i "s/ZeroBlog Demo/$ZERONET_DEFAULT_BLOG_TITLE/g" $MESH_INSTALL_DIR/zeronet/data/$ZERONET_BLOG_ADDRESS/index.html
 | 
	
		
			
			| 196 |  | -    sed -i "s|<h3 class=\"description\">.*|<h3 class=\"description\">$ZERONET_DEFAULT_BLOG_TAGLINE</h3>|g" $MESH_INSTALL_DIR/zeronet/data/$ZERONET_BLOG_ADDRESS/index.html
 | 
	
		
			
			| 197 |  | -    sed -i "s/Blogging platform Demo/Blogging platform/g" $MESH_INSTALL_DIR/zeronet/data/$ZERONET_BLOG_ADDRESS/content.json
 | 
	
		
			
			| 198 |  | -    python zeronet.py siteSign $ZERONET_BLOG_ADDRESS $ZERONET_BLOG_PRIVATE_KEY
 | 
	
		
			
			| 199 |  | -
 | 
	
		
			
			| 200 |  | -    # update the avahi service
 | 
	
		
			
			| 201 |  | -    echo '<?xml version="1.0" standalone="no"?><!--*-nxml-*-->' > /tmp/zeronet-blog.service
 | 
	
		
			
			| 202 |  | -    echo '<!DOCTYPE service-group SYSTEM "avahi-service.dtd">' >> /tmp/zeronet-blog.service
 | 
	
		
			
			| 203 |  | -    echo '<service-group>' >> /tmp/zeronet-blog.service
 | 
	
		
			
			| 204 |  | -    echo '  <name replace-wildcards="yes">%h ZeroNet Blog</name>' >> /tmp/zeronet-blog.service
 | 
	
		
			
			| 205 |  | -    echo '  <service>' >> /tmp/zeronet-blog.service
 | 
	
		
			
			| 206 |  | -    echo '    <type>_zeronet._udp</type>' >> /tmp/zeronet-blog.service
 | 
	
		
			
			| 207 |  | -    echo "    <port>$ZERONET_PORT</port>" >> /tmp/zeronet-blog.service
 | 
	
		
			
			| 208 |  | -    echo "    <txt-record>$ZERONET_URL/$ZERONET_BLOG_ADDRESS</txt-record>" >> /tmp/zeronet-blog.service
 | 
	
		
			
			| 209 |  | -    echo '  </service>' >> /tmp/zeronet-blog.service
 | 
	
		
			
			| 210 |  | -    echo '</service-group>' >> /tmp/zeronet-blog.service
 | 
	
		
			
			| 211 |  | -    cp /tmp/zeronet-blog.service /etc/avahi/services/zeronet-blog.service
 | 
	
		
			
			| 212 |  | -
 | 
	
		
			
			| 213 |  | -    if [ ! -d /home/${MY_USERNAME}/.config/zeronet ]; then
 | 
	
		
			
			| 214 |  | -        mkdir -p /home/${MY_USERNAME}/.config/zeronet
 | 
	
		
			
			| 215 |  | -        chown -R ${MY_USERNAME}:${MY_USERNAME} /home/${MY_USERNAME}/.config
 | 
	
		
			
			| 216 |  | -    fi
 | 
	
		
			
			| 217 |  | -    echo "$ZERONET_URL/$ZERONET_BLOG_ADDRESS" > /home/${MY_USERNAME}/.config/zeronet/myblog
 | 
	
		
			
			| 218 |  | -
 | 
	
		
			
			| 219 |  | -    sed -i "s|ZeroNet Blog address.*|ZeroNet Blog address: $ZERONET_BLOG_ADDRESS|g" /home/${MY_USERNAME}/README
 | 
	
		
			
			| 220 |  | -    sed -i "s|ZeroNet Blog private key.*|ZeroNet Blog private key: $ZERONET_BLOG_PRIVATE_KEY|g" /home/${MY_USERNAME}/README
 | 
	
		
			
			| 221 |  | -
 | 
	
		
			
			| 222 |  | -    if [ -d ${MESH_INSTALL_DIR}/zeronet ]; then
 | 
	
		
			
			| 223 |  | -        chown -R zeronet:zeronet ${MESH_INSTALL_DIR}/zeronet
 | 
	
		
			
			| 224 |  | -    fi
 | 
	
		
			
			| 225 |  | -
 | 
	
		
			
			| 226 |  | -    echo $'Update of ZeroNet Blog completed' >> $INSTALL_LOG
 | 
	
		
			
			| 227 |  | -}
 | 
	
		
			
			| 228 |  | -
 | 
	
		
			
			| 229 |  | -function configure_zeronet_mail {
 | 
	
		
			
			| 230 |  | -    echo $'Updating ZeroNet Mail' >> $INSTALL_LOG
 | 
	
		
			
			| 231 |  | -    ZERONET_DEFAULT_MAIL_TITLE="${MY_USERNAME}'s Mail"
 | 
	
		
			
			| 232 |  | -
 | 
	
		
			
			| 233 |  | -    cd $MESH_INSTALL_DIR/zeronet
 | 
	
		
			
			| 234 |  | -    python zeronet.py --batch siteCreate 2> $MESH_INSTALL_DIR/zeronet/mail.txt
 | 
	
		
			
			| 235 |  | -    if [ ! -f $MESH_INSTALL_DIR/zeronet/mail.txt ]; then
 | 
	
		
			
			| 236 |  | -        echo $'Unable to create ZeroNet mail' >> $INSTALL_LOG
 | 
	
		
			
			| 237 |  | -        exit 72574
 | 
	
		
			
			| 238 |  | -    fi
 | 
	
		
			
			| 239 |  | -    mail_address=$(cat $MESH_INSTALL_DIR/zeronet/mail.txt | grep "Site address" | awk -F ':' '{print $2}')
 | 
	
		
			
			| 240 |  | -    mail_private_key=$(cat $MESH_INSTALL_DIR/zeronet/mail.txt | grep "Site private key" | awk -F ':' '{print $2}')
 | 
	
		
			
			| 241 |  | -    ZERONET_MAIL_ADDRESS=${mail_address//[[:blank:]]/}
 | 
	
		
			
			| 242 |  | -    ZERONET_MAIL_PRIVATE_KEY=${mail_private_key//[[:blank:]]/}
 | 
	
		
			
			| 243 |  | -
 | 
	
		
			
			| 244 |  | -    if [ ${#ZERONET_MAIL_ADDRESS} -lt 20 ]; then
 | 
	
		
			
			| 245 |  | -        echo $"Address:    $ZERONET_MAIL_ADDRESS" >> $INSTALL_LOG
 | 
	
		
			
			| 246 |  | -        echo $"Public key: $ZERONET_MAIL_PRIVATE_KEY" >> $INSTALL_LOG
 | 
	
		
			
			| 247 |  | -        echo $'Unable to create zeronet mail address' >> $INSTALL_LOG
 | 
	
		
			
			| 248 |  | -        exit 7358
 | 
	
		
			
			| 249 |  | -    fi
 | 
	
		
			
			| 250 |  | -
 | 
	
		
			
			| 251 |  | -    if [ ${#ZERONET_MAIL_PRIVATE_KEY} -lt 20 ]; then
 | 
	
		
			
			| 252 |  | -        echo $"Address:    $ZERONET_MAIL_ADDRESS" >> $INSTALL_LOG
 | 
	
		
			
			| 253 |  | -        echo $"Public key: $ZERONET_MAIL_PRIVATE_KEY" >> $INSTALL_LOG
 | 
	
		
			
			| 254 |  | -        echo $'Unable to create zeronet mail private key' >> $INSTALL_LOG
 | 
	
		
			
			| 255 |  | -        exit 1639
 | 
	
		
			
			| 256 |  | -    fi
 | 
	
		
			
			| 257 |  | -
 | 
	
		
			
			| 258 |  | -    if [ ! -d "$MESH_INSTALL_DIR/zeronet/data/$ZERONET_MAIL_ADDRESS" ]; then
 | 
	
		
			
			| 259 |  | -        echo $"Unable to find site directory: $MESH_INSTALL_DIR/zeronet/data/$ZERONET_MAIL_ADDRESS" >> $INSTALL_LOG
 | 
	
		
			
			| 260 |  | -        exit 7638
 | 
	
		
			
			| 261 |  | -    fi
 | 
	
		
			
			| 262 |  | -
 | 
	
		
			
			| 263 |  | -    echo $"ZeroNet Mail address:     $ZERONET_MAIL_ADDRESS" >> $INSTALL_LOG
 | 
	
		
			
			| 264 |  | -    echo $"ZeroNet Mail private key: $ZERONET_MAIL_PRIVATE_KEY" >> $INSTALL_LOG
 | 
	
		
			
			| 265 |  | -    cp -r $MESH_INSTALL_DIR/zeronet/ZeroMail/* $MESH_INSTALL_DIR/zeronet/data/$ZERONET_MAIL_ADDRESS
 | 
	
		
			
			| 266 |  | -
 | 
	
		
			
			| 267 |  | -    if [ ! -d $MESH_INSTALL_DIR/zeronet/data/$ZERONET_MAIL_ADDRESS/data ]; then
 | 
	
		
			
			| 268 |  | -        mkdir $MESH_INSTALL_DIR/zeronet/data/$ZERONET_MAIL_ADDRESS/data
 | 
	
		
			
			| 269 |  | -    fi
 | 
	
		
			
			| 270 |  | -    cp $MESH_INSTALL_DIR/zeronet/data/$ZERONET_MAIL_ADDRESS/data-default/data.json $MESH_INSTALL_DIR/zeronet/data/$ZERONET_MAIL_ADDRESS/data
 | 
	
		
			
			| 271 |  | -    sed -i "s/MyZeroMail/$ZERONET_DEFAULT_MAIL_TITLE/g" $MESH_INSTALL_DIR/zeronet/data/$ZERONET_MAIL_ADDRESS/data/data.json
 | 
	
		
			
			| 272 |  | -    sed -i "s/My ZeroMail./$ZERONET_DEFAULT_MAIL_TAGLINE/g" $MESH_INSTALL_DIR/zeronet/data/$ZERONET_MAIL_ADDRESS/data/data.json
 | 
	
		
			
			| 273 |  | -    sed -i "s/ZeroMail Demo/$ZERONET_DEFAULT_MAIL_TITLE/g" $MESH_INSTALL_DIR/zeronet/data/$ZERONET_MAIL_ADDRESS/index.html
 | 
	
		
			
			| 274 |  | -    sed -i "s|<h3 class=\"description\">.*|<h3 class=\"description\">$ZERONET_DEFAULT_MAIL_TAGLINE</h3>|g" $MESH_INSTALL_DIR/zeronet/data/$ZERONET_MAIL_ADDRESS/index.html
 | 
	
		
			
			| 275 |  | -    sed -i "s/Mailging platform Demo/Mailging platform/g" $MESH_INSTALL_DIR/zeronet/data/$ZERONET_MAIL_ADDRESS/content.json
 | 
	
		
			
			| 276 |  | -    python zeronet.py siteSign $ZERONET_MAIL_ADDRESS $ZERONET_MAIL_PRIVATE_KEY
 | 
	
		
			
			| 277 |  | -
 | 
	
		
			
			| 278 |  | -    # Add an avahi service
 | 
	
		
			
			| 279 |  | -    echo '<?xml version="1.0" standalone="no"?><!--*-nxml-*-->' > /tmp/zeronet-mail.service
 | 
	
		
			
			| 280 |  | -    echo '<!DOCTYPE service-group SYSTEM "avahi-service.dtd">' >> /tmp/zeronet-mail.service
 | 
	
		
			
			| 281 |  | -    echo '<service-group>' >> /tmp/zeronet-mail.service
 | 
	
		
			
			| 282 |  | -    echo '  <name replace-wildcards="yes">%h ZeroNet Mail</name>' >> /tmp/zeronet-mail.service
 | 
	
		
			
			| 283 |  | -    echo '  <service>' >> /tmp/zeronet-mail.service
 | 
	
		
			
			| 284 |  | -    echo '    <type>_zeronet._udp</type>' >> /tmp/zeronet-mail.service
 | 
	
		
			
			| 285 |  | -    echo "    <port>$ZERONET_PORT</port>" >> /tmp/zeronet-mail.service
 | 
	
		
			
			| 286 |  | -    echo "    <txt-record>$ZERONET_URL/$ZERONET_MAIL_ADDRESS</txt-record>" >> /tmp/zeronet-mail.service
 | 
	
		
			
			| 287 |  | -    echo '  </service>' >> /tmp/zeronet-mail.service
 | 
	
		
			
			| 288 |  | -    echo '</service-group>' >> /tmp/zeronet-mail.service
 | 
	
		
			
			| 289 |  | -    cp /tmp/zeronet-mail.service /etc/avahi/services/zeronet-mail.service
 | 
	
		
			
			| 290 |  | -
 | 
	
		
			
			| 291 |  | -    if [ ! -d /home/${MY_USERNAME}/.config/zeronet ]; then
 | 
	
		
			
			| 292 |  | -        mkdir -p /home/${MY_USERNAME}/.config/zeronet
 | 
	
		
			
			| 293 |  | -        chown -R ${MY_USERNAME}:${MY_USERNAME} /home/${MY_USERNAME}/.config
 | 
	
		
			
			| 294 |  | -    fi
 | 
	
		
			
			| 295 |  | -    echo "$ZERONET_URL/$ZERONET_MAIL_ADDRESS" > /home/${MY_USERNAME}/.config/zeronet/mymail
 | 
	
		
			
			| 296 |  | -
 | 
	
		
			
			| 297 |  | -    sed -i "s|ZeroNet Mail address.*|ZeroNet Mail address: $ZERONET_MAIL_ADDRESS|g" /home/${MY_USERNAME}/README
 | 
	
		
			
			| 298 |  | -    sed -i "s|ZeroNet Mail private key.*|ZeroNet Mail private key: $ZERONET_MAIL_PRIVATE_KEY|g" /home/${MY_USERNAME}/README
 | 
	
		
			
			| 299 |  | -
 | 
	
		
			
			| 300 |  | -    if [ -d ${MESH_INSTALL_DIR}/zeronet ]; then
 | 
	
		
			
			| 301 |  | -        chown -R zeronet:zeronet ${MESH_INSTALL_DIR}/zeronet
 | 
	
		
			
			| 302 |  | -    fi
 | 
	
		
			
			| 303 |  | -
 | 
	
		
			
			| 304 |  | -    echo $'Update of ZeroNet Mail completed' >> $INSTALL_LOG
 | 
	
		
			
			| 305 |  | -}
 | 
	
		
			
			| 306 |  | -
 | 
	
		
			
			| 307 |  | -function configure_zeronet_forum {
 | 
	
		
			
			| 308 |  | -    echo $'Updating ZeroNet Forum' >> $INSTALL_LOG
 | 
	
		
			
			| 309 |  | -    ZERONET_DEFAULT_FORUM_TITLE="${MY_USERNAME}'s Forum"
 | 
	
		
			
			| 310 |  | -
 | 
	
		
			
			| 311 |  | -    cd $MESH_INSTALL_DIR/zeronet
 | 
	
		
			
			| 312 |  | -    python zeronet.py --batch siteCreate 2> $MESH_INSTALL_DIR/zeronet/forum.txt
 | 
	
		
			
			| 313 |  | -    if [ ! -f $MESH_INSTALL_DIR/zeronet/forum.txt ]; then
 | 
	
		
			
			| 314 |  | -        echo $'Unable to create ZeroNet forum' >> $INSTALL_LOG
 | 
	
		
			
			| 315 |  | -        exit 47962
 | 
	
		
			
			| 316 |  | -    fi
 | 
	
		
			
			| 317 |  | -    forum_address=$(cat $MESH_INSTALL_DIR/zeronet/forum.txt | grep "Site address" | awk -F ':' '{print $2}')
 | 
	
		
			
			| 318 |  | -    forum_private_key=$(cat $MESH_INSTALL_DIR/zeronet/forum.txt | grep "Site private key" | awk -F ':' '{print $2}')
 | 
	
		
			
			| 319 |  | -    ZERONET_FORUM_ADDRESS=${forum_address//[[:blank:]]/}
 | 
	
		
			
			| 320 |  | -    ZERONET_FORUM_PRIVATE_KEY=${forum_private_key//[[:blank:]]/}
 | 
	
		
			
			| 321 |  | -
 | 
	
		
			
			| 322 |  | -    if [ ${#ZERONET_FORUM_ADDRESS} -lt 20 ]; then
 | 
	
		
			
			| 323 |  | -        echo $"Address:    $ZERONET_FORUM_ADDRESS" >> $INSTALL_LOG
 | 
	
		
			
			| 324 |  | -        echo $"Public key: $ZERONET_FORUM_PRIVATE_KEY" >> $INSTALL_LOG
 | 
	
		
			
			| 325 |  | -        echo $'Unable to create zeronet forum address' >> $INSTALL_LOG
 | 
	
		
			
			| 326 |  | -        exit 76352
 | 
	
		
			
			| 327 |  | -    fi
 | 
	
		
			
			| 328 |  | -
 | 
	
		
			
			| 329 |  | -    if [ ${#ZERONET_FORUM_PRIVATE_KEY} -lt 20 ]; then
 | 
	
		
			
			| 330 |  | -        echo $"Address:    $ZERONET_FORUM_ADDRESS" >> $INSTALL_LOG
 | 
	
		
			
			| 331 |  | -        echo $"Public key: $ZERONET_FORUM_PRIVATE_KEY" >> $INSTALL_LOG
 | 
	
		
			
			| 332 |  | -        echo $'Unable to create zeronet forum private key' >> $INSTALL_LOG
 | 
	
		
			
			| 333 |  | -        exit 87356
 | 
	
		
			
			| 334 |  | -    fi
 | 
	
		
			
			| 335 |  | -
 | 
	
		
			
			| 336 |  | -    if [ ! -d "$MESH_INSTALL_DIR/zeronet/data/$ZERONET_FORUM_ADDRESS" ]; then
 | 
	
		
			
			| 337 |  | -        echo $"Unable to find site directory: $MESH_INSTALL_DIR/zeronet/data/$ZERONET_FORUM_ADDRESS" >> $INSTALL_LOG
 | 
	
		
			
			| 338 |  | -        exit 7638
 | 
	
		
			
			| 339 |  | -    fi
 | 
	
		
			
			| 340 |  | -
 | 
	
		
			
			| 341 |  | -    echo $"Forum address:     $ZERONET_FORUM_ADDRESS"
 | 
	
		
			
			| 342 |  | -    echo $"Forum private key: $ZERONET_FORUM_PRIVATE_KEY"
 | 
	
		
			
			| 343 |  | -    cp -r $MESH_INSTALL_DIR/zeronet/ZeroTalk/* $MESH_INSTALL_DIR/zeronet/data/$ZERONET_FORUM_ADDRESS
 | 
	
		
			
			| 344 |  | -    sed -i "s/ZeroBoard/$ZERONET_DEFAULT_FORUM_TITLE/g" $MESH_INSTALL_DIR/zeronet/data/$ZERONET_FORUM_ADDRESS/index.html
 | 
	
		
			
			| 345 |  | -    sed -i "s/ZeroTalk/$ZERONET_DEFAULT_FORUM_TITLE/g" $MESH_INSTALL_DIR/zeronet/data/$ZERONET_FORUM_ADDRESS/index.html
 | 
	
		
			
			| 346 |  | -    sed -i "s|Demo for dynamic, decentralized content publishing.|$ZERONET_DEFAULT_FORUM_TAGLINE|g" $MESH_INSTALL_DIR/zeronet/data/$ZERONET_FORUM_ADDRESS/index.html
 | 
	
		
			
			| 347 |  | -    sed -i 's/Messaging Board Demo/Messaging Board/g' $MESH_INSTALL_DIR/zeronet/data/$ZERONET_FORUM_ADDRESS/content.json
 | 
	
		
			
			| 348 |  | -    sed -i "s/ZeroBoard/$ZERONET_DEFAULT_FORUM_TITLE/g" $MESH_INSTALL_DIR/zeronet/data/$ZERONET_FORUM_ADDRESS/content.json
 | 
	
		
			
			| 349 |  | -    python zeronet.py siteSign $ZERONET_FORUM_ADDRESS $ZERONET_FORUM_PRIVATE_KEY --inner_path data/users/content.json
 | 
	
		
			
			| 350 |  | -
 | 
	
		
			
			| 351 |  | -    # Add an avahi service
 | 
	
		
			
			| 352 |  | -    echo '<?xml version="1.0" standalone="no"?><!--*-nxml-*-->' > /tmp/zeronet-forum.service
 | 
	
		
			
			| 353 |  | -    echo '<!DOCTYPE service-group SYSTEM "avahi-service.dtd">' >> /tmp/zeronet-forum.service
 | 
	
		
			
			| 354 |  | -    echo '<service-group>' >> /tmp/zeronet-forum.service
 | 
	
		
			
			| 355 |  | -    echo '  <name replace-wildcards="yes">%h ZeroNet Forum</name>' >> /tmp/zeronet-forum.service
 | 
	
		
			
			| 356 |  | -    echo '  <service>' >> /tmp/zeronet-forum.service
 | 
	
		
			
			| 357 |  | -    echo '    <type>_zeronet._udp</type>' >> /tmp/zeronet-forum.service
 | 
	
		
			
			| 358 |  | -    echo "    <port>$ZERONET_PORT</port>" >> /tmp/zeronet-forum.service
 | 
	
		
			
			| 359 |  | -    echo "    <txt-record>$ZERONET_URL/$ZERONET_FORUM_ADDRESS</txt-record>" >> /tmp/zeronet-forum.service
 | 
	
		
			
			| 360 |  | -    echo '  </service>' >> /tmp/zeronet-forum.service
 | 
	
		
			
			| 361 |  | -    echo '</service-group>' >> /tmp/zeronet-forum.service
 | 
	
		
			
			| 362 |  | -    sudo cp /tmp/zeronet-forum.service /etc/avahi/services/zeronet-forum.service
 | 
	
		
			
			| 363 |  | -
 | 
	
		
			
			| 364 |  | -    if [ ! -d /home/${MY_USERNAME}/.config/zeronet ]; then
 | 
	
		
			
			| 365 |  | -        mkdir -p /home/${MY_USERNAME}/.config/zeronet
 | 
	
		
			
			| 366 |  | -        chown -R ${MY_USERNAME}:${MY_USERNAME} /home/${MY_USERNAME}/.config
 | 
	
		
			
			| 367 |  | -    fi
 | 
	
		
			
			| 368 |  | -    echo "$ZERONET_URL/$ZERONET_FORUM_ADDRESS" > /home/${MY_USERNAME}/.config/zeronet/myforum
 | 
	
		
			
			| 369 |  | -
 | 
	
		
			
			| 370 |  | -    sed -i "s|ZeroNet Forum address.*|ZeroNet Forum address: $ZERONET_FORUM_ADDRESS|g" /home/${MY_USERNAME}/README
 | 
	
		
			
			| 371 |  | -    sed -i "s|ZeroNet Forum private key.*|ZeroNet Forum private key: $ZERONET_FORUM_PRIVATE_KEY|g" /home/${MY_USERNAME}/README
 | 
	
		
			
			| 372 |  | -
 | 
	
		
			
			| 373 |  | -    if [ -d ${MESH_INSTALL_DIR}/zeronet ]; then
 | 
	
		
			
			| 374 |  | -        chown -R zeronet:zeronet ${MESH_INSTALL_DIR}/zeronet
 | 
	
		
			
			| 375 |  | -    fi
 | 
	
		
			
			| 376 |  | -
 | 
	
		
			
			| 377 |  | -    echo $'Update of ZeroNet Forum completed' >> $INSTALL_LOG
 | 
	
		
			
			| 378 |  | -}
 | 
	
		
			
			| 379 |  | -
 | 
	
		
			
			| 380 |  | -function configure_zeronet_id {
 | 
	
		
			
			| 381 |  | -    echo $'Updating ZeroID' >> $INSTALL_LOG
 | 
	
		
			
			| 382 |  | -
 | 
	
		
			
			| 383 |  | -    cd $MESH_INSTALL_DIR/zeronet
 | 
	
		
			
			| 384 |  | -    python zeronet.py --batch siteCreate 2> $MESH_INSTALL_DIR/zeronet/zeroid.txt
 | 
	
		
			
			| 385 |  | -    if [ ! -f $MESH_INSTALL_DIR/zeronet/zeroid.txt ]; then
 | 
	
		
			
			| 386 |  | -        echo $'Unable to create ZeroID' >> $INSTALL_LOG
 | 
	
		
			
			| 387 |  | -        exit 47962
 | 
	
		
			
			| 388 |  | -    fi
 | 
	
		
			
			| 389 |  | -    zeroid_address=$(cat $MESH_INSTALL_DIR/zeronet/zeroid.txt | grep "Site address" | awk -F ':' '{print $2}')
 | 
	
		
			
			| 390 |  | -    zeroid_private_key=$(cat $MESH_INSTALL_DIR/zeronet/zeroid.txt | grep "Site private key" | awk -F ':' '{print $2}')
 | 
	
		
			
			| 391 |  | -    ZERONET_ID_ADDRESS=${zeroid_address//[[:blank:]]/}
 | 
	
		
			
			| 392 |  | -    ZERONET_ID_PRIVATE_KEY=${zeroid_private_key//[[:blank:]]/}
 | 
	
		
			
			| 393 |  | -
 | 
	
		
			
			| 394 |  | -    if [ ${#ZERONET_ID_ADDRESS} -lt 20 ]; then
 | 
	
		
			
			| 395 |  | -        echo $"Address:    $ZERONET_ID_ADDRESS" >> $INSTALL_LOG
 | 
	
		
			
			| 396 |  | -        echo $"Public key: $ZERONET_ID_PRIVATE_KEY" >> $INSTALL_LOG
 | 
	
		
			
			| 397 |  | -        echo $'Unable to create ZeroID address' >> $INSTALL_LOG
 | 
	
		
			
			| 398 |  | -        exit 76352
 | 
	
		
			
			| 399 |  | -    fi
 | 
	
		
			
			| 400 |  | -
 | 
	
		
			
			| 401 |  | -    if [ ${#ZERONET_ID_PRIVATE_KEY} -lt 20 ]; then
 | 
	
		
			
			| 402 |  | -        echo $"Address:    $ZERONET_ID_ADDRESS" >> $INSTALL_LOG
 | 
	
		
			
			| 403 |  | -        echo $"Public key: $ZERONET_ID_PRIVATE_KEY" >> $INSTALL_LOG
 | 
	
		
			
			| 404 |  | -        echo $'Unable to create ZeroID private key' >> $INSTALL_LOG
 | 
	
		
			
			| 405 |  | -        exit 87356
 | 
	
		
			
			| 406 |  | -    fi
 | 
	
		
			
			| 407 |  | -
 | 
	
		
			
			| 408 |  | -    if [ ! -d "$MESH_INSTALL_DIR/zeronet/data/$ZERONET_ID_ADDRESS" ]; then
 | 
	
		
			
			| 409 |  | -        echo $"Unable to find site directory: $MESH_INSTALL_DIR/zeronet/data/$ZERONET_ID_ADDRESS" >> $INSTALL_LOG
 | 
	
		
			
			| 410 |  | -        exit 378434
 | 
	
		
			
			| 411 |  | -    fi
 | 
	
		
			
			| 412 |  | -
 | 
	
		
			
			| 413 |  | -    echo $"ZeroID address:     $ZERONET_ID_ADDRESS"
 | 
	
		
			
			| 414 |  | -    echo $"ZeroID private key: $ZERONET_ID_PRIVATE_KEY"
 | 
	
		
			
			| 415 |  | -    cp -r $MESH_INSTALL_DIR/zeronet/ZeroID/* $MESH_INSTALL_DIR/zeronet/data/$ZERONET_ID_ADDRESS
 | 
	
		
			
			| 416 |  | -    # TODO
 | 
	
		
			
			| 417 |  | -    sed -i "s///g" $MESH_INSTALL_DIR/zeronet/data/$ZERONET_ID_ADDRESS/content.json
 | 
	
		
			
			| 418 |  | -    python zeronet.py siteSign $ZERONET_ID_ADDRESS $ZERONET_ID_PRIVATE_KEY --inner_path data/users/content.json
 | 
	
		
			
			| 419 |  | -
 | 
	
		
			
			| 420 |  | -    # Add an avahi service
 | 
	
		
			
			| 421 |  | -    echo '<?xml version="1.0" standalone="no"?><!--*-nxml-*-->' > /tmp/zeronet-id.service
 | 
	
		
			
			| 422 |  | -    echo '<!DOCTYPE service-group SYSTEM "avahi-service.dtd">' >> /tmp/zeronet-id.service
 | 
	
		
			
			| 423 |  | -    echo '<service-group>' >> /tmp/zeronet-id.service
 | 
	
		
			
			| 424 |  | -    echo '  <name replace-wildcards="yes">%h ZeroNet ID Service</name>' >> /tmp/zeronet-id.service
 | 
	
		
			
			| 425 |  | -    echo '  <service>' >> /tmp/zeronet-id.service
 | 
	
		
			
			| 426 |  | -    echo '    <type>_zeronet._udp</type>' >> /tmp/zeronet-id.service
 | 
	
		
			
			| 427 |  | -    echo "    <port>$ZERONET_PORT</port>" >> /tmp/zeronet-id.service
 | 
	
		
			
			| 428 |  | -    echo "    <txt-record>$ZERONET_URL/$ZERONET_ID_ADDRESS</txt-record>" >> /tmp/zeronet-id.service
 | 
	
		
			
			| 429 |  | -    echo '  </service>' >> /tmp/zeronet-id.service
 | 
	
		
			
			| 430 |  | -    echo '</service-group>' >> /tmp/zeronet-id.service
 | 
	
		
			
			| 431 |  | -    sudo cp /tmp/zeronet-id.service /etc/avahi/services/zeronet-id.service
 | 
	
		
			
			| 432 |  | -
 | 
	
		
			
			| 433 |  | -    if [ ! -d /home/${MY_USERNAME}/.config/zeronet ]; then
 | 
	
		
			
			| 434 |  | -        mkdir -p /home/${MY_USERNAME}/.config/zeronet
 | 
	
		
			
			| 435 |  | -        chown -R ${MY_USERNAME}:${MY_USERNAME} /home/${MY_USERNAME}/.config
 | 
	
		
			
			| 436 |  | -    fi
 | 
	
		
			
			| 437 |  | -    echo "$ZERONET_URL/$ZERONET_ID_ADDRESS" > /home/${MY_USERNAME}/.config/zeronet/myzeroid
 | 
	
		
			
			| 438 |  | -
 | 
	
		
			
			| 439 |  | -    sed -i "s|ZeroID address.*|ZeroID address: $ZERONET_ID_ADDRESS|g" /home/${MY_USERNAME}/README
 | 
	
		
			
			| 440 |  | -    sed -i "s|ZeroID private key.*|ZeroID private key: $ZERONET_ID_PRIVATE_KEY|g" /home/${MY_USERNAME}/README
 | 
	
		
			
			| 441 |  | -
 | 
	
		
			
			| 442 |  | -    if [ -d ${MESH_INSTALL_DIR}/zeronet ]; then
 | 
	
		
			
			| 443 |  | -        chown -R zeronet:zeronet ${MESH_INSTALL_DIR}/zeronet
 | 
	
		
			
			| 444 |  | -    fi
 | 
	
		
			
			| 445 |  | -
 | 
	
		
			
			| 446 |  | -    echo $'Update of ZeroID completed' >> $INSTALL_LOG
 | 
	
		
			
			| 447 |  | -}
 | 
	
		
			
			| 448 |  | -
 | 
	
		
			
			| 449 | 134 |  function configure_toxcore {
 | 
	
		
			
			| 450 | 135 |      echo $'Configuring toxcore' >> $INSTALL_LOG
 | 
	
		
			
			| 451 | 136 |  
 | 
	
	
		
			
			|  | @@ -568,7 +253,6 @@ function show_desktop_icons {
 | 
	
		
			
			| 568 | 253 |      chown ${MY_USERNAME}:${MY_USERNAME} /home/$MY_USERNAME/Desktop/*
 | 
	
		
			
			| 569 | 254 |      chown ${MY_USERNAME}:${MY_USERNAME} /home/$MY_USERNAME/.config
 | 
	
		
			
			| 570 | 255 |      chown -R ${MY_USERNAME}:${MY_USERNAME} /home/$MY_USERNAME/.config/tox
 | 
	
		
			
			| 571 |  | -    chown -R ${MY_USERNAME}:${MY_USERNAME} /home/$MY_USERNAME/.config/zeronet
 | 
	
		
			
			| 572 | 256 |      chown -R ${MY_USERNAME}:${MY_USERNAME} /home/$MY_USERNAME/.config/autostart
 | 
	
		
			
			| 573 | 257 |      chown ${MY_USERNAME}:${MY_USERNAME} /home/$MY_USERNAME/*.sh
 | 
	
		
			
			| 574 | 258 |  
 | 
	
	
		
			
			|  | @@ -628,9 +312,6 @@ function mesh_amnesic {
 | 
	
		
			
			| 628 | 312 |  function mesh_restart_daemons {
 | 
	
		
			
			| 629 | 313 |      systemctl restart avahi-daemon
 | 
	
		
			
			| 630 | 314 |      systemctl restart tox-bootstrapd
 | 
	
		
			
			| 631 |  | -    if [ $ENABLE_ZERONET ]; then
 | 
	
		
			
			| 632 |  | -        systemctl restart zeronet
 | 
	
		
			
			| 633 |  | -    fi
 | 
	
		
			
			| 634 | 315 |      echo $'Daemons restarted' >> $INSTALL_LOG
 | 
	
		
			
			| 635 | 316 |  }
 | 
	
		
			
			| 636 | 317 |  
 | 
	
	
		
			
			|  | @@ -731,41 +412,6 @@ function setup_amnesic_data {
 | 
	
		
			
			| 731 | 412 |      else
 | 
	
		
			
			| 732 | 413 |          echo "WARNING: ${tomb_name} tomb not found" >> $INSTALL_LOG
 | 
	
		
			
			| 733 | 414 |      fi
 | 
	
		
			
			| 734 |  | -
 | 
	
		
			
			| 735 |  | -    tomb_name=zeronet-config
 | 
	
		
			
			| 736 |  | -    create_tomb ${tomb_name} $TOMB_ZERONET_CONFIG_SIZE_MB
 | 
	
		
			
			| 737 |  | -    if [ -d /media/${tomb_name} ]; then
 | 
	
		
			
			| 738 |  | -        if [ ! -d /home/${MY_USERNAME}/.config ]; then
 | 
	
		
			
			| 739 |  | -            mkdir -p /home/${MY_USERNAME}/.config
 | 
	
		
			
			| 740 |  | -            chown ${MY_USERNAME}:${MY_USERNAME} /home/${MY_USERNAME}/.config
 | 
	
		
			
			| 741 |  | -        fi
 | 
	
		
			
			| 742 |  | -        if [ -d /home/${MY_USERNAME}/.config/zeronet ]; then
 | 
	
		
			
			| 743 |  | -            rm -rf /home/${MY_USERNAME}/.config/zeronet
 | 
	
		
			
			| 744 |  | -        fi
 | 
	
		
			
			| 745 |  | -        ln -s /media/${tomb_name} /home/${MY_USERNAME}/.config/zeronet
 | 
	
		
			
			| 746 |  | -        chown -R ${MY_USERNAME}:${MY_USERNAME} /home/${MY_USERNAME}/.config/zeronet
 | 
	
		
			
			| 747 |  | -        chown -R ${MY_USERNAME}:${MY_USERNAME} /media/${tomb_name}
 | 
	
		
			
			| 748 |  | -        echo "${tomb_name} tomb created" >> $INSTALL_LOG
 | 
	
		
			
			| 749 |  | -    else
 | 
	
		
			
			| 750 |  | -        echo "WARNING: ${tomb_name} tomb not found" >> $INSTALL_LOG
 | 
	
		
			
			| 751 |  | -    fi
 | 
	
		
			
			| 752 |  | -
 | 
	
		
			
			| 753 |  | -    tomb_name=zeronet-data
 | 
	
		
			
			| 754 |  | -    create_tomb ${tomb_name} $TOMB_ZERONET_DATA_SIZE_MB
 | 
	
		
			
			| 755 |  | -    if [ -d /media/${tomb_name} ]; then
 | 
	
		
			
			| 756 |  | -        if [ -d /var/lib/zeronet ]; then
 | 
	
		
			
			| 757 |  | -            if [ ! -d /var/lib/zeronet_base ]; then
 | 
	
		
			
			| 758 |  | -                mv /var/lib/zeronet /var/lib/zeronet_base
 | 
	
		
			
			| 759 |  | -            fi
 | 
	
		
			
			| 760 |  | -        fi
 | 
	
		
			
			| 761 |  | -        ln -s /media/${tomb_name} /var/lib/zeronet
 | 
	
		
			
			| 762 |  | -        if [ -d /var/lib/zeronet_base ]; then
 | 
	
		
			
			| 763 |  | -            cp -rp /var/lib/zeronet_base/* /media/${tomb_name}
 | 
	
		
			
			| 764 |  | -        fi
 | 
	
		
			
			| 765 |  | -        echo "${tomb_name} tomb created" >> $INSTALL_LOG
 | 
	
		
			
			| 766 |  | -    else
 | 
	
		
			
			| 767 |  | -        echo "WARNING: ${tomb_name} tomb not found" >> $INSTALL_LOG
 | 
	
		
			
			| 768 |  | -    fi
 | 
	
		
			
			| 769 | 415 |  }
 | 
	
		
			
			| 770 | 416 |  
 | 
	
		
			
			| 771 | 417 |  function setup_ipfs {
 | 
	
	
		
			
			|  | @@ -924,13 +570,6 @@ if [ -f $MESH_INSTALL_SETUP ]; then
 | 
	
		
			
			| 924 | 570 |      create_ram_disk 1
 | 
	
		
			
			| 925 | 571 |      setup_amnesic_data
 | 
	
		
			
			| 926 | 572 |      change_avahi_name
 | 
	
		
			
			| 927 |  | -    if [ $ENABLE_ZERONET ]; then
 | 
	
		
			
			| 928 |  | -        configure_zeronet_blog
 | 
	
		
			
			| 929 |  | -        configure_zeronet_mail
 | 
	
		
			
			| 930 |  | -        configure_zeronet_forum
 | 
	
		
			
			| 931 |  | -        configure_zeronet_id
 | 
	
		
			
			| 932 |  | -        configure_zeronet
 | 
	
		
			
			| 933 |  | -    fi
 | 
	
		
			
			| 934 | 573 |      configure_toxcore
 | 
	
		
			
			| 935 | 574 |      create_tox_user
 | 
	
		
			
			| 936 | 575 |      #setup_tahoelafs
 |