Browse Source

No zeronet user directory

Bob Mottram 8 years ago
parent
commit
97411dfd7d
2 changed files with 7 additions and 16 deletions
  1. 1
    1
      src/freedombone-meshweb
  2. 6
    15
      src/zeronetavahi

+ 1
- 1
src/freedombone-meshweb View File

@@ -60,7 +60,7 @@ if [ ${ctr} -lt "1" ]; then
60 60
    exit 0
61 61
 fi
62 62
 
63
-ZERONET_INDEX=/home/$MY_USERNAME/mesh.html
63
+ZERONET_INDEX=$MESH_INSTALL_DIR/zeronet/mesh.html
64 64
 
65 65
 if which firefox > /dev/null; then
66 66
     firefox $ZERONET_INDEX

+ 6
- 15
src/zeronetavahi View File

@@ -40,22 +40,13 @@ MESH_INSTALL_DIR=/var/lib
40 40
 WEB_PAGE_TITLE=$"${PROJECT_NAME} Mesh"
41 41
 TRACKER_PORT=6969
42 42
 ZERONET_INSTALL=$MESH_INSTALL_DIR/zeronet
43
-ZERONET_USER_HOME=/home/zeronet
44 43
 MY_USERNAME=$USER
45 44
 
46
-if [ ! -d $ZERONET_INSTALL ]; then
47
-	if [ -d /home/$MY_USERNAME/zeronet ]; then
48
-		ZERONET_INSTALL=/home/$MY_USERNAME/zeronet
49
-	else
50
-		exit 0
51
-	fi
52
-fi
53
-
54 45
 BLOGS_FILE=$ZERONET_INSTALL/${PROJECT_NAME}-blogs
55 46
 MAIL_FILE=$ZERONET_INSTALL/${PROJECT_NAME}-mail
56 47
 FORUM_FILE=$ZERONET_INSTALL/${PROJECT_NAME}-fora
57 48
 TOX_USERS_FILE=$ZERONET_INSTALL/${PROJECT_NAME}-tox-users
58
-ZERONET_INDEX=/home/$MY_USERNAME/mesh.html
49
+ZERONET_INDEX=$ZERONET_INSTALL/mesh.html
59 50
 ZERONET_CONFIG=$ZERONET_INSTALL/bootstrap
60 51
 
61 52
 IPFS_PORT=4001
@@ -361,7 +352,7 @@ function zeronet_update_config {
361 352
 		fi
362 353
 	fi
363 354
 	rm -f $ZERONET_CONFIG.new
364
-	if [ -d $ZERONET_USER_HOME ]; then
355
+	if [ -d $ZERONET_INSTALL ]; then
365 356
 		sudo chown zeronet:zeronet $ZERONET_CONFIG
366 357
 	fi
367 358
 }
@@ -393,9 +384,9 @@ create_footer $TOX_USERS_FILE
393 384
 # make the index page
394 385
 create_index
395 386
 
396
-assemble_web_page ${BLOGS_FILE} $ZERONET_USER_HOME
397
-assemble_web_page ${MAIL_FILE} $ZERONET_USER_HOME
398
-assemble_web_page ${FORUM_FILE} $ZERONET_USER_HOME
399
-assemble_web_page ${TOX_USERS_FILE} $ZERONET_USER_HOME
387
+assemble_web_page ${BLOGS_FILE} $ZERONET_INSTALL
388
+assemble_web_page ${MAIL_FILE} $ZERONET_INSTALL
389
+assemble_web_page ${FORUM_FILE} $ZERONET_INSTALL
390
+assemble_web_page ${TOX_USERS_FILE} $ZERONET_INSTALL
400 391
 
401 392
 exit 0