瀏覽代碼

Supply more onions

Bob Mottram 8 年之前
父節點
當前提交
35a9e2bf5f
共有 2 個檔案被更改,包括 32 行新增20 行删除
  1. 31
    19
      src/freedombone-app-jitsi
  2. 1
    1
      src/freedombone-app-mailpile

+ 31
- 19
src/freedombone-app-jitsi 查看文件

30
 # You should have received a copy of the GNU Affero General Public License
30
 # You should have received a copy of the GNU Affero General Public License
31
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
31
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
32
 
32
 
33
-VARIANTS=""
33
+VARIANTS="full full-vim chat"
34
 
34
 
35
 IN_DEFAULT_INSTALL=0
35
 IN_DEFAULT_INSTALL=0
36
-SHOW_ON_ABOUT=0
36
+SHOW_ON_ABOUT=1
37
 
37
 
38
 VIDEOBRIDGE_PORT=5347
38
 VIDEOBRIDGE_PORT=5347
39
 JITSI_ONION_PORT=8102
39
 JITSI_ONION_PORT=8102
40
 JITSI_VIDEOBRIDGE_ONION_PORT=8103
40
 JITSI_VIDEOBRIDGE_ONION_PORT=8103
41
 JITSI_AUTH_ONION_PORT=8104
41
 JITSI_AUTH_ONION_PORT=8104
42
 JITSI_FOCUS_ONION_PORT=8105
42
 JITSI_FOCUS_ONION_PORT=8105
43
+JITSI_PORT=5280
43
 
44
 
44
 # domains
45
 # domains
45
 JITSI_DOMAIN_NAME=
46
 JITSI_DOMAIN_NAME=
331
 
332
 
332
     prosody_config=/etc/prosody/conf.avail/${JITSI_DOMAIN_NAME}.cfg.lua
333
     prosody_config=/etc/prosody/conf.avail/${JITSI_DOMAIN_NAME}.cfg.lua
333
     echo "VirtualHost \"${JITSI_DOMAIN_NAME}\"" > $prosody_config
334
     echo "VirtualHost \"${JITSI_DOMAIN_NAME}\"" > $prosody_config
334
-    echo 'authentication = "anonymous"' >> $prosody_config
335
-    echo 'ssl = {' >> $prosody_config
336
-    echo "    key = \"/etc/prosody/certs/${JITSI_DOMAIN_NAME}.key\";" >> $prosody_config
337
-    echo "    certificate = \"/etc/prosody/certs/${JITSI_DOMAIN_NAME}.pem\";" >> $prosody_config
338
-    echo "    dhparam = \"/etc/prosody/certs/${JITSI_DOMAIN_NAME}.dhparam\";" >> $prosody_config
339
-    echo '    options = {"no_sslv2", "no_sslv3" };' >> $prosody_config
340
-    echo '}' >> $prosody_config
335
+    echo '    authentication = "anonymous"' >> $prosody_config
336
+    echo '    ssl = {' >> $prosody_config
337
+    echo "        key = \"/etc/prosody/certs/${JITSI_DOMAIN_NAME}.key\";" >> $prosody_config
338
+    echo "        certificate = \"/etc/prosody/certs/${JITSI_DOMAIN_NAME}.pem\";" >> $prosody_config
339
+    echo "        dhparam = \"/etc/prosody/certs/${JITSI_DOMAIN_NAME}.dhparam\";" >> $prosody_config
340
+    echo '        options = {"no_sslv2", "no_sslv3" };' >> $prosody_config
341
+    echo '    }' >> $prosody_config
341
     echo '' >> $prosody_config
342
     echo '' >> $prosody_config
342
-    echo 'modules_enabled = {' >> $prosody_config
343
-    echo '    "bosh";' >> $prosody_config
344
-    echo '    "pubsub";' >> $prosody_config
345
-    echo '    "tls";' >> $prosody_config
346
-    echo '    "onions";' >> $prosody_config
347
-    echo '    "saslauth";' >> $prosody_config
348
-    echo '}' >> $prosody_config
343
+    echo '    modules_enabled = {' >> $prosody_config
344
+    echo '        "bosh";' >> $prosody_config
345
+    echo '        "pubsub";' >> $prosody_config
346
+    echo '        "tls";' >> $prosody_config
347
+    echo '        "onions";' >> $prosody_config
348
+    echo '    }' >> $prosody_config
349
     echo '' >> $prosody_config
349
     echo '' >> $prosody_config
350
     echo "VirtualHost \"${JITSI_ONION_HOSTNAME}\"" > $prosody_config
350
     echo "VirtualHost \"${JITSI_ONION_HOSTNAME}\"" > $prosody_config
351
     echo '    authentication = "anonymous"' >> $prosody_config
351
     echo '    authentication = "anonymous"' >> $prosody_config
352
+    echo '    modules_enabled = {' >> $prosody_config
353
+    echo '        "bosh";' >> $prosody_config
354
+    echo '        "pubsub";' >> $prosody_config
355
+    echo '        "onions";' >> $prosody_config
356
+    echo '    }' >> $prosody_config
352
     echo '' >> $prosody_config
357
     echo '' >> $prosody_config
353
     echo "VirtualHost \"${JITSI_AUTH_ONION_HOSTNAME}\"" >> $prosody_config
358
     echo "VirtualHost \"${JITSI_AUTH_ONION_HOSTNAME}\"" >> $prosody_config
354
     echo '    authentication = "internal_plain"' >> $prosody_config
359
     echo '    authentication = "internal_plain"' >> $prosody_config
360
+    echo '    modules_enabled = {' >> $prosody_config
361
+    echo '        "onions";' >> $prosody_config
362
+    echo '    }' >> $prosody_config
355
     echo '' >> $prosody_config
363
     echo '' >> $prosody_config
356
     echo "admins = { \"focus@${JITSI_AUTH_ONION_HOSTNAME}\" }" >> $prosody_config
364
     echo "admins = { \"focus@${JITSI_AUTH_ONION_HOSTNAME}\" }" >> $prosody_config
357
     echo '' >> $prosody_config
365
     echo '' >> $prosody_config
434
         echo '  }' >> $jitsi_nginx_site
442
         echo '  }' >> $jitsi_nginx_site
435
         echo '' >> $jitsi_nginx_site
443
         echo '' >> $jitsi_nginx_site
436
         echo '  location /http-bind {' >> $jitsi_nginx_site
444
         echo '  location /http-bind {' >> $jitsi_nginx_site
437
-        echo '      proxy_pass      http://localhost:5280/http-bind;' >> $jitsi_nginx_site
445
+        echo "      proxy_pass      http://localhost:${JITSI_PORT}/http-bind;" >> $jitsi_nginx_site
438
         echo '      proxy_set_header X-Forwarded-For $remote_addr;' >> $jitsi_nginx_site
446
         echo '      proxy_set_header X-Forwarded-For $remote_addr;' >> $jitsi_nginx_site
439
         echo '      proxy_set_header Host $http_host;' >> $jitsi_nginx_site
447
         echo '      proxy_set_header Host $http_host;' >> $jitsi_nginx_site
440
         echo '  }' >> $jitsi_nginx_site
448
         echo '  }' >> $jitsi_nginx_site
444
     fi
452
     fi
445
     echo 'server {' >> $jitsi_nginx_site
453
     echo 'server {' >> $jitsi_nginx_site
446
     echo "    listen 127.0.0.1:$JITSI_ONION_PORT default_server;" >> $jitsi_nginx_site
454
     echo "    listen 127.0.0.1:$JITSI_ONION_PORT default_server;" >> $jitsi_nginx_site
447
-    echo "    server_name ${JITSI_DOMAIN_NAME};" >> $jitsi_nginx_site
455
+    if [[ $ONION_ONLY == 'no' ]]; then
456
+        echo "    server_name ${JITSI_DOMAIN_NAME};" >> $jitsi_nginx_site
457
+    else
458
+        echo "    server_name ${JITSI_ONION_HOSTNAME};" >> $jitsi_nginx_site
459
+    fi
448
     echo '' >> $jitsi_nginx_site
460
     echo '' >> $jitsi_nginx_site
449
     function_check nginx_disable_sniffing
461
     function_check nginx_disable_sniffing
450
     nginx_disable_sniffing $JITSI_DOMAIN_NAME
462
     nginx_disable_sniffing $JITSI_DOMAIN_NAME
468
     echo '  }' >> $jitsi_nginx_site
480
     echo '  }' >> $jitsi_nginx_site
469
     echo '' >> $jitsi_nginx_site
481
     echo '' >> $jitsi_nginx_site
470
     echo '  location /http-bind {' >> $jitsi_nginx_site
482
     echo '  location /http-bind {' >> $jitsi_nginx_site
471
-    echo '      proxy_pass      http://localhost:5280/http-bind;' >> $jitsi_nginx_site
483
+    echo "      proxy_pass      http://localhost:${JITSI_PORT}/http-bind;" >> $jitsi_nginx_site
472
     echo '      proxy_set_header X-Forwarded-For $remote_addr;' >> $jitsi_nginx_site
484
     echo '      proxy_set_header X-Forwarded-For $remote_addr;' >> $jitsi_nginx_site
473
     echo '      proxy_set_header Host $http_host;' >> $jitsi_nginx_site
485
     echo '      proxy_set_header Host $http_host;' >> $jitsi_nginx_site
474
     echo '  }' >> $jitsi_nginx_site
486
     echo '  }' >> $jitsi_nginx_site

+ 1
- 1
src/freedombone-app-mailpile 查看文件

28
 # You should have received a copy of the GNU Affero General Public License
28
 # You should have received a copy of the GNU Affero General Public License
29
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
29
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
30
 
30
 
31
-VARIANTS="full full-vim writer"
31
+VARIANTS="full full-vim mailbox"
32
 
32
 
33
 IN_DEFAULT_INSTALL=0
33
 IN_DEFAULT_INSTALL=0
34
 SHOW_ON_ABOUT=1
34
 SHOW_ON_ABOUT=1