Bob Mottram 9 years ago
parent
commit
0e1bc94216
3 changed files with 9 additions and 4 deletions
  1. 4
    2
      src/freedombone
  2. 3
    1
      src/freedombone-client
  3. 2
    1
      src/freedombone-mesh

+ 4
- 2
src/freedombone View File

193
 HUBZILLA_CODE=
193
 HUBZILLA_CODE=
194
 HUBZILLA_ONION_PORT=8085
194
 HUBZILLA_ONION_PORT=8085
195
 HUBZILLA_REPO="https://github.com/redmatrix/hubzilla.git"
195
 HUBZILLA_REPO="https://github.com/redmatrix/hubzilla.git"
196
+HUBZILLA_THEMES_REPO='https://github.com/DeadSuperHero/redmatrix-themes'
196
 HUBZILLA_ADDONS_REPO="https://github.com/redmatrix/hubzilla-addons.git"
197
 HUBZILLA_ADDONS_REPO="https://github.com/redmatrix/hubzilla-addons.git"
197
 HUBZILLA_ADMIN_PASSWORD=
198
 HUBZILLA_ADMIN_PASSWORD=
198
 HUBZILLA_COMMIT='761afd029d97703f2f7609d546b7b5f3d257c601'
199
 HUBZILLA_COMMIT='761afd029d97703f2f7609d546b7b5f3d257c601'
428
 
429
 
429
 TOX_PORT=33445
430
 TOX_PORT=33445
430
 TOX_REPO='git://github.com/irungentoo/toxcore.git'
431
 TOX_REPO='git://github.com/irungentoo/toxcore.git'
432
+TOXID_REPO='https://github.com/bashrc/toxid'
431
 TOX_COMMIT='73b2144edcfd1ca617e9054479b66ab0c0361a14'
433
 TOX_COMMIT='73b2144edcfd1ca617e9054479b66ab0c0361a14'
432
 TOX_BOOTSTRAP_ID_FILE=/var/lib/tox-bootstrapd/pubkey.txt
434
 TOX_BOOTSTRAP_ID_FILE=/var/lib/tox-bootstrapd/pubkey.txt
433
 # These are some default nodes, but you can replace them with trusted nodes
435
 # These are some default nodes, but you can replace them with trusted nodes
6835
 
6837
 
6836
     # install a command to obtain the Tox ID
6838
     # install a command to obtain the Tox ID
6837
     cd $INSTALL_DIR
6839
     cd $INSTALL_DIR
6838
-    git clone https://github.com/bashrc/toxid
6840
+    git clone $TOXID_REPO
6839
     if [ ! -d $INSTALL_DIR/toxid ]; then
6841
     if [ ! -d $INSTALL_DIR/toxid ]; then
6840
         exit 63921
6842
         exit 63921
6841
     fi
6843
     fi
8597
         fi
8599
         fi
8598
 
8600
 
8599
         # some extra themes
8601
         # some extra themes
8600
-        git clone https://github.com/DeadSuperHero/redmatrix-themes /var/www/$HUBZILLA_DOMAIN_NAME/htdocs/redmatrix-themes1
8602
+        git clone $HUBZILLA_THEMES_REPO /var/www/$HUBZILLA_DOMAIN_NAME/htdocs/redmatrix-themes1
8601
         cp -r /var/www/$HUBZILLA_DOMAIN_NAME/htdocs/redmatrix-themes1/* view/theme/
8603
         cp -r /var/www/$HUBZILLA_DOMAIN_NAME/htdocs/redmatrix-themes1/* view/theme/
8602
 
8604
 
8603
         chown -R www-data:www-data /var/www/$HUBZILLA_DOMAIN_NAME/htdocs
8605
         chown -R www-data:www-data /var/www/$HUBZILLA_DOMAIN_NAME/htdocs

+ 3
- 1
src/freedombone-client View File

56
 IPFS_PORT=4001
56
 IPFS_PORT=4001
57
 TRACKER_PORT=6969
57
 TRACKER_PORT=6969
58
 
58
 
59
+TOXID_REPO='https://github.com/bashrc/toxid'
60
+
59
 # see https://stribika.github.io/2015/01/04/secure-secure-shell.html
61
 # see https://stribika.github.io/2015/01/04/secure-secure-shell.html
60
 function ssh_remove_small_moduli {
62
 function ssh_remove_small_moduli {
61
   sudo awk '$5 > 2000' /etc/ssh/moduli > /home/$CURR_USER/moduli
63
   sudo awk '$5 > 2000' /etc/ssh/moduli > /home/$CURR_USER/moduli
128
               mkdir ~/develop
130
               mkdir ~/develop
129
           fi
131
           fi
130
           cd ~/develop
132
           cd ~/develop
131
-          git clone https://github.com/bashrc/toxid
133
+          git clone $TOXID_REPO
132
       fi
134
       fi
133
       cd ~/develop/toxid
135
       cd ~/develop/toxid
134
       sudo make install
136
       sudo make install

+ 2
- 1
src/freedombone-mesh View File

41
 
41
 
42
 TOX_PORT=33445
42
 TOX_PORT=33445
43
 TOXCORE_REPO='git://github.com/irungentoo/toxcore.git'
43
 TOXCORE_REPO='git://github.com/irungentoo/toxcore.git'
44
+TOXID_REPO='https://github.com/bashrc/toxid'
44
 TOX_BOOTSTRAP_ID_FILE=/var/lib/tox-bootstrapd/pubkey.txt
45
 TOX_BOOTSTRAP_ID_FILE=/var/lib/tox-bootstrapd/pubkey.txt
45
 QTOX_INI="/home/$USER/.config/tox/qtox.ini"
46
 QTOX_INI="/home/$USER/.config/tox/qtox.ini"
46
 
47
 
143
         return
144
         return
144
     fi
145
     fi
145
     cd ~/develop
146
     cd ~/develop
146
-    git clone https://github.com/bashrc/toxid
147
+    git clone $TOXID_REPO
147
     cd ~/develop/toxid
148
     cd ~/develop/toxid
148
     make
149
     make
149
     sudo make install
150
     sudo make install