Supply more onions

src/freedombone-app-jitsi

@@ -30,16 +30,17 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-VARIANTS=""
+VARIANTS="full full-vim chat"
 
 IN_DEFAULT_INSTALL=0
-SHOW_ON_ABOUT=0
+SHOW_ON_ABOUT=1
 
 VIDEOBRIDGE_PORT=5347
 JITSI_ONION_PORT=8102
 JITSI_VIDEOBRIDGE_ONION_PORT=8103
 JITSI_AUTH_ONION_PORT=8104
 JITSI_FOCUS_ONION_PORT=8105
+JITSI_PORT=5280
 
 # domains
 JITSI_DOMAIN_NAME=
@@ -331,27 +332,34 @@ function install_jitsi_xmpp {
 
     prosody_config=/etc/prosody/conf.avail/${JITSI_DOMAIN_NAME}.cfg.lua
     echo "VirtualHost \"${JITSI_DOMAIN_NAME}\"" > $prosody_config
-    echo 'authentication = "anonymous"' >> $prosody_config
-    echo 'ssl = {' >> $prosody_config
-    echo "    key = \"/etc/prosody/certs/${JITSI_DOMAIN_NAME}.key\";" >> $prosody_config
-    echo "    certificate = \"/etc/prosody/certs/${JITSI_DOMAIN_NAME}.pem\";" >> $prosody_config
-    echo "    dhparam = \"/etc/prosody/certs/${JITSI_DOMAIN_NAME}.dhparam\";" >> $prosody_config
-    echo '    options = {"no_sslv2", "no_sslv3" };' >> $prosody_config
-    echo '}' >> $prosody_config
+    echo '    authentication = "anonymous"' >> $prosody_config
+    echo '    ssl = {' >> $prosody_config
+    echo "        key = \"/etc/prosody/certs/${JITSI_DOMAIN_NAME}.key\";" >> $prosody_config
+    echo "        certificate = \"/etc/prosody/certs/${JITSI_DOMAIN_NAME}.pem\";" >> $prosody_config
+    echo "        dhparam = \"/etc/prosody/certs/${JITSI_DOMAIN_NAME}.dhparam\";" >> $prosody_config
+    echo '        options = {"no_sslv2", "no_sslv3" };' >> $prosody_config
+    echo '    }' >> $prosody_config
     echo '' >> $prosody_config
-    echo 'modules_enabled = {' >> $prosody_config
-    echo '    "bosh";' >> $prosody_config
-    echo '    "pubsub";' >> $prosody_config
-    echo '    "tls";' >> $prosody_config
-    echo '    "onions";' >> $prosody_config
-    echo '    "saslauth";' >> $prosody_config
-    echo '}' >> $prosody_config
+    echo '    modules_enabled = {' >> $prosody_config
+    echo '        "bosh";' >> $prosody_config
+    echo '        "pubsub";' >> $prosody_config
+    echo '        "tls";' >> $prosody_config
+    echo '        "onions";' >> $prosody_config
+    echo '    }' >> $prosody_config
     echo '' >> $prosody_config
     echo "VirtualHost \"${JITSI_ONION_HOSTNAME}\"" > $prosody_config
     echo '    authentication = "anonymous"' >> $prosody_config
+    echo '    modules_enabled = {' >> $prosody_config
+    echo '        "bosh";' >> $prosody_config
+    echo '        "pubsub";' >> $prosody_config
+    echo '        "onions";' >> $prosody_config
+    echo '    }' >> $prosody_config
     echo '' >> $prosody_config
     echo "VirtualHost \"${JITSI_AUTH_ONION_HOSTNAME}\"" >> $prosody_config
     echo '    authentication = "internal_plain"' >> $prosody_config
+    echo '    modules_enabled = {' >> $prosody_config
+    echo '        "onions";' >> $prosody_config
+    echo '    }' >> $prosody_config
     echo '' >> $prosody_config
     echo "admins = { \"focus@${JITSI_AUTH_ONION_HOSTNAME}\" }" >> $prosody_config
     echo '' >> $prosody_config
@@ -434,7 +442,7 @@ function install_jitsi_meet {
         echo '  }' >> $jitsi_nginx_site
         echo '' >> $jitsi_nginx_site
         echo '  location /http-bind {' >> $jitsi_nginx_site
-        echo '      proxy_pass      http://localhost:5280/http-bind;' >> $jitsi_nginx_site
+        echo "      proxy_pass      http://localhost:${JITSI_PORT}/http-bind;" >> $jitsi_nginx_site
         echo '      proxy_set_header X-Forwarded-For $remote_addr;' >> $jitsi_nginx_site
         echo '      proxy_set_header Host $http_host;' >> $jitsi_nginx_site
         echo '  }' >> $jitsi_nginx_site
@@ -444,7 +452,11 @@ function install_jitsi_meet {
     fi
     echo 'server {' >> $jitsi_nginx_site
     echo "    listen 127.0.0.1:$JITSI_ONION_PORT default_server;" >> $jitsi_nginx_site
-    echo "    server_name ${JITSI_DOMAIN_NAME};" >> $jitsi_nginx_site
+    if [[ $ONION_ONLY == 'no' ]]; then
+        echo "    server_name ${JITSI_DOMAIN_NAME};" >> $jitsi_nginx_site
+    else
+        echo "    server_name ${JITSI_ONION_HOSTNAME};" >> $jitsi_nginx_site
+    fi
     echo '' >> $jitsi_nginx_site
     function_check nginx_disable_sniffing
     nginx_disable_sniffing $JITSI_DOMAIN_NAME
@@ -468,7 +480,7 @@ function install_jitsi_meet {
     echo '  }' >> $jitsi_nginx_site
     echo '' >> $jitsi_nginx_site
     echo '  location /http-bind {' >> $jitsi_nginx_site
-    echo '      proxy_pass      http://localhost:5280/http-bind;' >> $jitsi_nginx_site
+    echo "      proxy_pass      http://localhost:${JITSI_PORT}/http-bind;" >> $jitsi_nginx_site
     echo '      proxy_set_header X-Forwarded-For $remote_addr;' >> $jitsi_nginx_site
     echo '      proxy_set_header Host $http_host;' >> $jitsi_nginx_site
     echo '  }' >> $jitsi_nginx_site

src/freedombone-app-mailpile

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