Procházet zdrojové kódy

Since the bootstrap file is small, just generate it directly

Bob Mottram před 7 roky
rodič
revize
33ae6d4444
1 změnil soubory, kde provedl 28 přidání a 51 odebrání
  1. 28
    51
      src/freedombone-app-datserver

+ 28
- 51
src/freedombone-app-datserver Zobrazit soubor

@@ -46,12 +46,12 @@ DATSERVER_PORT=3282
46 46
 # bootstrap servers are specified here
47 47
 DATSERVER_BOOTSTRAP_FILE=$DATSERVER_DIRECTORY/node_modules/datland-swarm-defaults/index.js
48 48
 
49
-DATSERVER_DISCOVERY1=
50
-DATSERVER_DISCOVERY2=
51
-DATSERVER_BOOTSTRAP1=
52
-DATSERVER_BOOTSTRAP2=
53
-DATSERVER_BOOTSTRAP3=
54
-DATSERVER_BOOTSTRAP4=
49
+DATSERVER_DISCOVERY1='discovery1.publicbits.org'
50
+DATSERVER_DISCOVERY2='discovery2.publicbits.org'
51
+DATSERVER_BOOTSTRAP1='bootstrap1.publicbits.org:6881'
52
+DATSERVER_BOOTSTRAP2='bootstrap2.publicbits.org:6881'
53
+DATSERVER_BOOTSTRAP3='bootstrap3.publicbits.org:6881'
54
+DATSERVER_BOOTSTRAP4='bootstrap4.publicbits.org:6881'
55 55
 
56 56
 datserver_variables=(MY_USERNAME
57 57
                      DATSERVER_DISCOVERY1
@@ -61,52 +61,29 @@ datserver_variables=(MY_USERNAME
61 61
                      DATSERVER_BOOTSTRAP3
62 62
                      DATSERVER_BOOTSTRAP4)
63 63
 
64
-function datserver_add_discovery_domain {
65
-    server_domain="$1"
66
-
67
-    if [ ! "$server_domain" ]; then
68
-        return
69
-    fi
70
-
71
-    if [ ${#server_domain} -lt 4 ]; then
72
-        return
73
-    fi
74
-
75
-    if grep -q "$server_domain" $DATSERVER_BOOTSTRAP_FILE; then
76
-       return
77
-    fi
78
-
79
-    sed -i "/var DEFAULT_DISCOVERY/a '$server_domain'," $DATSERVER_BOOTSTRAP_FILE
80
-    sed -i "s|'$server_domain',|  '$server_domain',|g" $DATSERVER_BOOTSTRAP_FILE
81
-}
82
-
83
-function datserver_add_bootstrap {
84
-    boostrap_server="$1"
85
-
86
-    if [ ! "$boostrap_server" ]; then
87
-        return
88
-    fi
89
-
90
-    if [ ${#boostrap_server} -lt 4 ]; then
91
-        return
92
-    fi
93
-
94
-    if grep -q "$boostrap_server" $DATSERVER_BOOTSTRAP_FILE; then
95
-       return
96
-    fi
97
-
98
-    sed -i "/var DEFAULT_BOOTSTRAP/a '$boostrap_server'," $DATSERVER_BOOTSTRAP_FILE
99
-    sed -i "s|'$boostrap_server',|  '$boostrap_server',|g" $DATSERVER_BOOTSTRAP_FILE
100
-}
101
-
102 64
 function datserver_generate_bootstraps {
103
-    datserver_add_discovery_domain "$DATSERVER_DISCOVERY1"
104
-    datserver_add_discovery_domain "$DATSERVER_DISCOVERY2"
105
-
106
-    datserver_add_bootstrap "$DATSERVER_BOOTSTRAP1"
107
-    datserver_add_bootstrap "$DATSERVER_BOOTSTRAP2"
108
-    datserver_add_bootstrap "$DATSERVER_BOOTSTRAP3"
109
-    datserver_add_bootstrap "$DATSERVER_BOOTSTRAP4"
65
+  { echo "var extend = require('xtend')";
66
+    echo '';
67
+    echo "var DAT_DOMAIN = 'dat.local'";
68
+    echo 'var DEFAULT_DISCOVERY = [';
69
+    echo "  '$DATSERVER_DISCOVERY1',";
70
+    echo "  '$DATSERVER_DISCOVERY2'";
71
+    echo ']';
72
+    echo 'var DEFAULT_BOOTSTRAP = [';
73
+    echo "  '$DATSERVER_BOOTSTRAP1',";
74
+    echo "  '$DATSERVER_BOOTSTRAP2',";
75
+    echo "  '$DATSERVER_BOOTSTRAP3',";
76
+    echo "  '$DATSERVER_BOOTSTRAP4'";
77
+    echo ']';
78
+    echo '';
79
+    echo 'var DEFAULT_OPTS = {';
80
+    echo '  dns: {server: DEFAULT_DISCOVERY, domain: DAT_DOMAIN},';
81
+    echo '  dht: {bootstrap: DEFAULT_BOOTSTRAP}';
82
+    echo '}';
83
+    echo '';
84
+    echo 'module.exports = function (opts) {';
85
+    echo '  return extend(DEFAULT_OPTS, opts) // opts takes priority';
86
+    echo '}'; } > $DATSERVER_BOOTSTRAP_FILE
110 87
 }
111 88
 
112 89
 function logging_on_datserver {