From 3d83d1636ba57c6dbfe2b1be130c706f24a786da Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Wed, 6 Jul 2016 15:40:09 +0100 Subject: [PATCH] Populate upgrade functions for apps --- src/freedombone-app-blog | 10 +- src/freedombone-app-cjdns | 10 +- src/freedombone-app-gnusocial | 53 ++- src/freedombone-app-gogs | 24 +- src/freedombone-app-hubzilla | 36 +- src/freedombone-app-ipfs | 20 +- src/freedombone-app-rss | 39 +- src/freedombone-app-searx | 43 +-- src/freedombone-app-tox | 19 +- src/freedombone-app-webmail | 14 +- src/freedombone-app-xmpp | 674 +++++++++++++++++----------------- src/freedombone-app-zeronet | 23 +- 12 files changed, 504 insertions(+), 461 deletions(-) diff --git a/src/freedombone-app-blog b/src/freedombone-app-blog index a2dd80b2..671ec7cc 100755 --- a/src/freedombone-app-blog +++ b/src/freedombone-app-blog @@ -37,7 +37,11 @@ MY_BLOG_TITLE="My Blog" MY_BLOG_SUBTITLE="Another ${PROJECT_NAME} Blog" function upgrade_blog { - echo '' + if ! grep -Fxq "install_blog" $COMPLETION_FILE; then + return + fi + function_check set_repo_commit + set_repo_commit /var/www/$FULLBLOG_DOMAIN_NAME/htdocs "Blog commit" "$FULLBLOG_COMMIT" $FULLBLOG_REPO } function backup_local_blog { @@ -88,10 +92,6 @@ function install_blog { exit 5062 fi - # update to the next commit - function_check set_repo_commit - set_repo_commit /var/www/$FULLBLOG_DOMAIN_NAME/htdocs "Blog commit" "$FULLBLOG_COMMIT" $FULLBLOG_REPO - if grep -Fxq "install_blog" $COMPLETION_FILE; then return fi diff --git a/src/freedombone-app-cjdns b/src/freedombone-app-cjdns index 5f6a1ab0..35957ad7 100755 --- a/src/freedombone-app-cjdns +++ b/src/freedombone-app-cjdns @@ -41,7 +41,11 @@ CJDCMD_REPO="https://github.com/inhies/cjdcmd" CJDCMD_COMMIT='973cca6ed0eecf9041c3403a40193c0b1291b808' function upgrade_cjdns { - echo '' + if ! grep -Fxq "install_cjdns" $COMPLETION_FILE; then + return + fi + function_check set_repo_commit + set_repo_commit /etc/cjdns "cjdns commit" "$CJDNS_COMMIT" $CJDNS_REPO } function configure_firewall_for_cjdns { @@ -142,10 +146,6 @@ function install_cjdns_main { return fi - # update to the next commit - function_check set_repo_commit - set_repo_commit /etc/cjdns "cjdns commit" "$CJDNS_COMMIT" $CJDNS_REPO - if grep -Fxq "install_cjdns_main" $COMPLETION_FILE; then return fi diff --git a/src/freedombone-app-gnusocial b/src/freedombone-app-gnusocial index d99d391d..f47d972c 100755 --- a/src/freedombone-app-gnusocial +++ b/src/freedombone-app-gnusocial @@ -47,10 +47,39 @@ SHARINGS_COMMIT='d5c6c7f855d9afff9086c09ea706f38c859bc0d4' SHARINGS_THEME_REPO="http://git.lasindias.club/manuel/SharingsTheme" SHARINGS_THEME_COMMIT='7106c7ef03' -function upgrade_gnusocial { - echo '' +function gnusocial_running_script { + if ! grep -Fxq "install_gnusocial" $COMPLETION_FILE; then + return + fi + + # check that the daemon is running + echo '#!/bin/bash' > /etc/cron.hourly/gnusocial-daemons + echo 'daemon_lines=$(ps aux | grep "scripts/queuedaemon.php" | grep "/var/www")' >> /etc/cron.hourly/gnusocial-daemons + echo 'if [[ $daemon_lines != *"/var/www/"* ]]; then' >> /etc/cron.hourly/gnusocial-daemons + + echo " ADMIN_USER=\$(cat $COMPLETION_FILE | grep 'Admin user' | awk -F ':' '{print \$2}')" >> /etc/cron.hourly/gnusocial-daemons + echo ' MY_EMAIL_ADDRESS=$ADMIN_USER@$HOSTNAME' >> /etc/cron.hourly/gnusocial-daemons + echo ' echo "Restarting GNU Social daemons" | mail -s "GNU Social daemons not found" $MY_EMAIL_ADDRESS' >> /etc/cron.hourly/gnusocial-daemons + echo " cd /var/www/${MICROBLOG_DOMAIN_NAME}/htdocs" >> /etc/cron.hourly/gnusocial-daemons + echo ' scripts/startdaemons.sh' >> /etc/cron.hourly/gnusocial-daemons + echo 'fi' >> /etc/cron.hourly/gnusocial-daemons + chmod +x /etc/cron.hourly/gnusocial-daemons } +function upgrade_gnusocial { + if ! grep -Fxq "install_gnusocial_main" $COMPLETION_FILE; then + return + fi + + # update to the next commit + function_check set_repo_commit + set_repo_commit /var/www/$MICROBLOG_DOMAIN_NAME/htdocs "GNU Social commit" "$MICROBLOG_COMMIT" $MICROBLOG_REPO + + function_check gnusocial_running_script + gnusocial_running_script +} + + function backup_local_gnusocial { echo '' } @@ -87,27 +116,13 @@ function install_gnusocial_main { exit 7359 fi - # update to the next commit - function_check set_repo_commit - set_repo_commit /var/www/$MICROBLOG_DOMAIN_NAME/htdocs "GNU Social commit" "$MICROBLOG_COMMIT" $MICROBLOG_REPO - - # add a script to check that the daemon is running - echo '#!/bin/bash' > /etc/cron.hourly/gnusocial-daemons - echo 'daemon_lines=$(ps aux | grep "scripts/queuedaemon.php" | grep "/var/www")' >> /etc/cron.hourly/gnusocial-daemons - echo 'if [[ $daemon_lines != *"/var/www/"* ]]; then' >> /etc/cron.hourly/gnusocial-daemons - - echo " ADMIN_USER=\$(cat $COMPLETION_FILE | grep 'Admin user' | awk -F ':' '{print \$2}')" >> /etc/cron.hourly/gnusocial-daemons - echo ' MY_EMAIL_ADDRESS=$ADMIN_USER@$HOSTNAME' >> /etc/cron.hourly/gnusocial-daemons - echo ' echo "Restarting GNU Social daemons" | mail -s "GNU Social daemons not found" $MY_EMAIL_ADDRESS' >> /etc/cron.hourly/gnusocial-daemons - echo " cd /var/www/${MICROBLOG_DOMAIN_NAME}/htdocs" >> /etc/cron.hourly/gnusocial-daemons - echo ' scripts/startdaemons.sh' >> /etc/cron.hourly/gnusocial-daemons - echo 'fi' >> /etc/cron.hourly/gnusocial-daemons - chmod +x /etc/cron.hourly/gnusocial-daemons - if grep -Fxq "install_gnusocial_main" $COMPLETION_FILE; then return fi + function_check gnusocial_running_script + gnusocial_running_script + function_check install_mariadb install_mariadb diff --git a/src/freedombone-app-gogs b/src/freedombone-app-gogs index f045dd08..f5d4c2f2 100755 --- a/src/freedombone-app-gogs +++ b/src/freedombone-app-gogs @@ -36,15 +36,23 @@ GIT_ADMIN_PASSWORD= GOGS_COMMIT='3fb4f7f4980b4339fd9ef6a3ba5b0acab83d264d' function upgrade_gogs { - echo '' + if ! grep -Fxq "install_gogs" $COMPLETION_FILE; then + return + fi + + function_check select_go_version + select_go_version + + function_check set_repo_commit + set_repo_commit $GOPATH/src/github.com/gogits/gogs "Gogs commit" "$GOGS_COMMIT" $GIT_DOMAIN_REPO } function backup_local_gogs { - echo '' + echo '' } function backup_remote_gogs { - echo '' + echo '' } function remove_gogs { @@ -80,17 +88,13 @@ function install_gogs { return fi - function_check select_go_version - select_go_version - - # update to the next commit - function_check - set_repo_commit $GOPATH/src/github.com/gogits/gogs "Gogs commit" "$GOGS_COMMIT" $GIT_DOMAIN_REPO - if grep -Fxq "install_gogs" $COMPLETION_FILE; then return fi + function_check select_go_version + select_go_version + if [ -d $GOPATH/src/github.com/gogits ]; then rm -rf $GOPATH/src/github.com/gogits fi diff --git a/src/freedombone-app-hubzilla b/src/freedombone-app-hubzilla index 1bc47944..7cdd30d5 100755 --- a/src/freedombone-app-hubzilla +++ b/src/freedombone-app-hubzilla @@ -39,15 +39,29 @@ HUBZILLA_COMMIT='2d79e75788aa71664a379c4cea0b6bfe3ab87ad0' HUBZILLA_ADDONS_COMMIT='67b40c7a40f328a93ee030eb15e9e1261f3cba64' function upgrade_hubzilla { - echo '' + if ! grep -Fxq "install_hubzilla" $COMPLETION_FILE; then + return + fi + HUBZILLA_PATH=/var/www/$HUBZILLA_DOMAIN_NAME/htdocs + + function_check set_repo_commit + set_repo_commit $HUBZILLA_PATH "Hubzilla commit" "$HUBZILLA_COMMIT" $HUBZILLA_REPO + set_repo_commit $HUBZILLA_PATH/addon "Hubzilla addons commit" "$HUBZILLA_ADDONS_COMMIT" $HUBZILLA_ADDONS_REPO + if [ -d $HUBZILLA_PATH/redmatrix-themes1 ]; then + cd $HUBZILLA_PATH/redmatrix-themes1 + git stash + git pull + cp -r $HUBZILLA_PATH/redmatrix-themes1/* $HUBZILLA_PATH/view/theme/ + chown -R www-data:www-data $HUBZILLA_PATH + fi } function backup_local_hubzilla { - echo '' + echo '' } function backup_remote_hubzilla { - echo '' + echo '' } function remove_hubzilla { @@ -77,24 +91,12 @@ function install_hubzilla { return fi - HUBZILLA_PATH=/var/www/$HUBZILLA_DOMAIN_NAME/htdocs - - # update to a new commit if needed - function_check set_repo_commit - set_repo_commit $HUBZILLA_PATH "Hubzilla commit" "$HUBZILLA_COMMIT" $HUBZILLA_REPO - set_repo_commit $HUBZILLA_PATH/addon "Hubzilla addons commit" "$HUBZILLA_ADDONS_COMMIT" $HUBZILLA_ADDONS_REPO - if [ -d $HUBZILLA_PATH/redmatrix-themes1 ]; then - cd $HUBZILLA_PATH/redmatrix-themes1 - git stash - git pull - cp -r $HUBZILLA_PATH/redmatrix-themes1/* $HUBZILLA_PATH/view/theme/ - chown -R www-data:www-data $HUBZILLA_PATH - fi - if grep -Fxq "install_hubzilla" $COMPLETION_FILE; then return fi + HUBZILLA_PATH=/var/www/$HUBZILLA_DOMAIN_NAME/htdocs + function_check install_mariadb install_mariadb diff --git a/src/freedombone-app-ipfs b/src/freedombone-app-ipfs index b84828e8..8a0607d1 100755 --- a/src/freedombone-app-ipfs +++ b/src/freedombone-app-ipfs @@ -33,7 +33,15 @@ IPFS_COMMIT='20b06a4cbce8884f5b194da6e98cb11f2c77f166' IPFS_PORT=4001 function upgrade_ipfs { - echo '' + if ! grep -Fxq "install_ipfs" $COMPLETION_FILE; then + return + fi + + function_check select_go_version + select_go_version + + function_check set_repo_commit + set_repo_commit $GOPATH/src/github.com/ipfs/go-ipfs "ipfs commit" "$IPFS_COMMIT" $IPFS_REPO } function backup_local_ipfs { @@ -86,17 +94,13 @@ function install_ipfs { return fi - function_check select_go_version - select_go_version - - # update to the next commit - function_check set_repo_commit - set_repo_commit $GOPATH/src/github.com/ipfs/go-ipfs "ipfs commit" "$IPFS_COMMIT" $IPFS_REPO - if grep -Fxq "install_ipfs" $COMPLETION_FILE; then return fi + function_check select_go_version + select_go_version + apt-get -y install golang libpam0g-dev fuse if [ ! -d /home/git ]; then diff --git a/src/freedombone-app-rss b/src/freedombone-app-rss index 5cadb9ca..f9270286 100755 --- a/src/freedombone-app-rss +++ b/src/freedombone-app-rss @@ -41,7 +41,36 @@ RSS_READER_GNUSOCIAL_REPO="https://github.com/bashrc/ttrss-gnusocial" RSS_READER_GNUSOCIAL_COMMIT='8b92b8f5db7b0d12459c7bd86a50f48815efe642' function upgrade_rss { - echo '' + if grep -Fxq "install_rss" $COMPLETION_FILE; then + function_check set_repo_commit + set_repo_commit $RSS_READER_PATH "RSS reader commit" "$RSS_READER_COMMIT" $RSS_READER_REPO + fi + + if grep -Fxq "install_rss_mobile_reader" $COMPLETION_FILE; then + if [ ! $RSS_READER_PATH ]; then + RSS_READER_PATH=/etc/share/tt-rss + fi + + if [ ! -d $RSS_READER_PATH ]; then + echo $'tt-rss is not installed, so the mobile version cannot be installed' + exit 63452 + fi + + RSS_MOBILE_READER_PATH=/etc/share/ttrss-mobile + + # remove any previous install + if [ -d $RSS_READER_PATH/g2ttree-mobile ]; then + if grep -Fxq "install_rss_mobile_reader" $COMPLETION_FILE; then + sed -i '/install_rss_mobile_reader/d' $COMPLETION_FILE + sed -i '/RSS mobile reader commit/d' $COMPLETION_FILE + rm -rf $RSS_READER_PATH/g2ttree-mobile + fi + fi + + # update to the next commit + function_check set_repo_commit + set_repo_commit $RSS_MOBILE_READER_PATH "RSS mobile reader commit" "$RSS_MOBILE_READER_COMMIT" $RSS_MOBILE_READER_REPO + fi } function backup_local_rss { @@ -93,10 +122,6 @@ function install_rss_main { return fi - # update to the next commit - function_check set_repo_commit - set_repo_commit $RSS_READER_PATH "RSS reader commit" "$RSS_READER_COMMIT" $RSS_READER_REPO - if grep -Fxq "install_rss_main" $COMPLETION_FILE; then return fi @@ -415,10 +440,6 @@ function install_rss_mobile_reader { fi fi - # update to the next commit - function_check set_repo_commit - set_repo_commit $RSS_MOBILE_READER_PATH "RSS mobile reader commit" "$RSS_MOBILE_READER_COMMIT" $RSS_MOBILE_READER_REPO - if grep -Fxq "install_rss_mobile_reader" $COMPLETION_FILE; then return fi diff --git a/src/freedombone-app-searx b/src/freedombone-app-searx index 49ad3a9b..cab470eb 100755 --- a/src/freedombone-app-searx +++ b/src/freedombone-app-searx @@ -37,7 +37,28 @@ SEARX_LOGIN_TEXT=$"Search engine login" SEARX_PASSWORD= function upgrade_searx { - echo '' + if ! grep -Fxq "install_searx" $COMPLETION_FILE; then + return + fi + + set_repo_commit $SEARX_PATH/searx "Search engine commit" "$SEARX_COMMIT" $SEARX_REPO + if grep "Search engine key" $COMPLETION_FILE; then + if [ -f ${SEARX_PATH}/searx/searx/settings.yml ]; then + # note: this might change to a --tor option in a later version + if ! grep 'socks5://127.0.0.1:9050' ${SEARX_PATH}/searx/searx/settings.yml; then + echo 'outgoing: # communication with search engines' >> ${SEARX_PATH}/searx/searx/settings.yml + echo ' proxies:' >> ${SEARX_PATH}/searx/searx/settings.yml + echo ' http : socks5://127.0.0.1:9050' >> ${SEARX_PATH}/searx/searx/settings.yml + echo ' https: socks5://127.0.0.1:9050' >> ${SEARX_PATH}/searx/searx/settings.yml + fi + SEARX_SECRET_KEY=$(cat $COMPLETION_FILE | grep "Search engine key" | awk -F ':' '{print $2}') + sed -i "s|secret_key.*|secret_key : \"${SEARX_SECRET_KEY}\"|g" ${SEARX_PATH}/searx/searx/settings.yml + if [ -f /var/lib/tor/hidden_service_searx/hostname ]; then + SEARX_ONION_HOSTNAME=$(echo /var/lib/tor/hidden_service_searx/hostname) + sed -i '0,/RE/s/base_url.*/base_url : \"http://${SEARX_ONION_HOSTNAME}\/' ${SEARX_PATH}/searx/searx/settings.yml + fi + fi + fi } function backup_local_searx { @@ -79,26 +100,6 @@ function install_searx { exit 62429 fi - # update to a new commit if needed - set_repo_commit $SEARX_PATH/searx "Search engine commit" "$SEARX_COMMIT" $SEARX_REPO - if grep "Search engine key" $COMPLETION_FILE; then - if [ -f ${SEARX_PATH}/searx/searx/settings.yml ]; then - # note: this might change to a --tor option in a later version - if ! grep 'socks5://127.0.0.1:9050' ${SEARX_PATH}/searx/searx/settings.yml; then - echo 'outgoing: # communication with search engines' >> ${SEARX_PATH}/searx/searx/settings.yml - echo ' proxies:' >> ${SEARX_PATH}/searx/searx/settings.yml - echo ' http : socks5://127.0.0.1:9050' >> ${SEARX_PATH}/searx/searx/settings.yml - echo ' https: socks5://127.0.0.1:9050' >> ${SEARX_PATH}/searx/searx/settings.yml - fi - SEARX_SECRET_KEY=$(cat $COMPLETION_FILE | grep "Search engine key" | awk -F ':' '{print $2}') - sed -i "s|secret_key.*|secret_key : \"${SEARX_SECRET_KEY}\"|g" ${SEARX_PATH}/searx/searx/settings.yml - if [ -f /var/lib/tor/hidden_service_searx/hostname ]; then - SEARX_ONION_HOSTNAME=$(echo /var/lib/tor/hidden_service_searx/hostname) - sed -i '0,/RE/s/base_url.*/base_url : \"http://${SEARX_ONION_HOSTNAME}\/' ${SEARX_PATH}/searx/searx/settings.yml - fi - fi - fi - if grep -Fxq "install_searx" $COMPLETION_FILE; then return fi diff --git a/src/freedombone-app-tox b/src/freedombone-app-tox index 2bf647fc..68b76259 100755 --- a/src/freedombone-app-tox +++ b/src/freedombone-app-tox @@ -45,7 +45,14 @@ TOXIC_COMMIT='cf16849b374e484a33a4dffa3dfb937b59d537f2' TOXIC_FILE=/usr/local/bin/toxic function upgrade_tox { - echo '' + if ! grep -Fxq "install_tox" $COMPLETION_FILE; then + return + fi + function_check set_repo_commit + set_repo_commit $INSTALL_DIR/toxcore "toxcore commit" "$TOXCORE_COMMIT" $TOXCORE_REPO + + function_check set_repo_commit + set_repo_commit $INSTALL_DIR/toxic "Toxic commit" "$TOXIC_COMMIT" $TOXIC_REPO } function backup_local_tox { @@ -172,10 +179,6 @@ function install_tox_node { return fi - # update to the next commit - function_check set_repo_commit - set_repo_commit $INSTALL_DIR/toxcore "toxcore commit" "$TOXCORE_COMMIT" $TOXCORE_REPO - if grep -Fxq "install_tox_node" $COMPLETION_FILE; then return fi @@ -231,10 +234,6 @@ function install_tox_client { return fi - # update to the next commit - function_check set_repo_commit - set_repo_commit $INSTALL_DIR/toxic "Toxic commit" "$TOXIC_COMMIT" $TOXIC_REPO - if grep -Fxq "install_tox_client" $COMPLETION_FILE; then return fi @@ -255,7 +254,7 @@ function install_tox_client { } function install_tox { - if ! grep -Fxq "install_tox" $COMPLETION_FILE; then + if grep -Fxq "install_tox" $COMPLETION_FILE; then return fi configure_firewall_for_tox diff --git a/src/freedombone-app-webmail b/src/freedombone-app-webmail index e3bcdee6..cc1cdf35 100755 --- a/src/freedombone-app-webmail +++ b/src/freedombone-app-webmail @@ -37,15 +37,19 @@ WEB_PATH=/var/www WEBMAIL_PATH=$WEB_PATH/webmail function upgrade_webmail { - echo '' + if ! grep -Fxq "install_webmail" $COMPLETION_FILE; then + return + fi + function_check set_repo_commit + set_repo_commit $WEBMAIL_PATH "Webmail commit" "$WEBMAIL_COMMIT" $WEBMAIL_REPO } function backup_local_webmail { - echo '' + echo '' } function backup_remote_webmail { - echo '' + echo '' } function remove_webmail { @@ -72,10 +76,6 @@ function install_webmail { return fi - # update to a new commit if needed - function_check set_repo_commit - set_repo_commit $WEBMAIL_PATH "Webmail commit" "$WEBMAIL_COMMIT" $WEBMAIL_REPO - if grep -Fxq "install_webmail" $COMPLETION_FILE; then return fi diff --git a/src/freedombone-app-xmpp b/src/freedombone-app-xmpp index 1a6da69c..78374412 100755 --- a/src/freedombone-app-xmpp +++ b/src/freedombone-app-xmpp @@ -35,393 +35,397 @@ XMPP_PASSWORD= XMPP_CIPHERS='"EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA256:EECDH:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!IDEA:!ECDSA:kEDH:CAMELLIA128-SHA:AES128-SHA"' XMPP_ECC_CURVE='"secp384r1"' +function update_prosody_modules { + if [ ! -d $INSTALL_DIR/prosody-modules ]; then + return + fi + if [ ! -d /usr/lib/prosody ]; then + return + fi + + cd $INSTALL_DIR/prosody-modules + hg pull + hg update + + # support onion addresses + if [ -f $INSTALL_DIR/prosody-modules/mod_onions/mod_onions.lua ]; then + cp $INSTALL_DIR/prosody-modules/mod_onions/mod_onions.lua /usr/lib/prosody/modules/mod_onions.lua + fi + + # XEP-0313 message archive management + # https://modules.prosody.im/mod_mam.html + # Allows you to download your previous messages onto a new client + # This only applies if you are not using forward secret crypto + # such as OTR or OMEMO (eg. OpenPGP) + if [ -d $INSTALL_DIR/prosody-modules/mod_mam ]; then + cp $INSTALL_DIR/prosody-modules/mod_mam/*.lua /usr/lib/prosody/modules + fi + + # XEP-0352 Client State Indication + # Notifies the server if the app is in the background or not + if [ -d $INSTALL_DIR/prosody-modules/mod_csi ]; then + cp $INSTALL_DIR/prosody-modules/mod_csi/*.lua /usr/lib/prosody/modules + fi + + # XEP-0280 Message Carbons + # Ensures all messages get delivered to all clients (if you have a mobile and desktop client) + if [ -d $INSTALL_DIR/prosody-modules/mod_carbons ]; then + cp $INSTALL_DIR/prosody-modules/mod_carbons/*.lua /usr/lib/prosody/modules + fi + + # XEP-0198 Stream management + # Helps mobile apps recover when a device switches networks. + if [ -d $INSTALL_DIR/prosody-modules/mod_smacks ]; then + cp $INSTALL_DIR/prosody-modules/mod_smacks/*.lua /usr/lib/prosody/modules + fi + if [ -d $INSTALL_DIR/prosody-modules/mod_smacks_offline ]; then + cp $INSTALL_DIR/prosody-modules/mod_smacks_offline/*.lua /usr/lib/prosody/modules + fi + + # XEP-0191: blocking + if [ -d $INSTALL_DIR/prosody-modules/mod_blocking ]; then + cp $INSTALL_DIR/prosody-modules/mod_blocking/*.lua /usr/lib/prosody/modules + fi + + # XEP-0016 Privacy lists + if [ -d $INSTALL_DIR/prosody-modules/mod_privacy_lists ]; then + cp $INSTALL_DIR/prosody-modules/mod_privacy_lists/*.lua /usr/lib/prosody/modules + fi +} + function upgrade_xmpp { - echo '' + if ! grep -Fxq "install_xmpp_main" $COMPLETION_FILE; then + return + fi + function_check update_prosody_modules + update_prosody_modules } function backup_local_xmpp { - echo '' + echo '' } function backup_remote_xmpp { - echo '' + echo '' } function configure_firewall_for_xmpp { - if [ ! -d /etc/prosody ]; then - return - fi - if grep -Fxq "configure_firewall_for_xmpp" $COMPLETION_FILE; then - return - fi - if [[ $INSTALLED_WITHIN_DOCKER == "yes" ]]; then - # docker does its own firewalling - return - fi - if [[ $ONION_ONLY != "no" ]]; then - return - fi - iptables -A INPUT -p tcp --dport 5222:5223 -j ACCEPT - iptables -A INPUT -p tcp --dport 5269 -j ACCEPT - iptables -A INPUT -p tcp --dport 5280:5281 -j ACCEPT - function_check save_firewall_settings - save_firewall_settings + if [ ! -d /etc/prosody ]; then + return + fi + if grep -Fxq "configure_firewall_for_xmpp" $COMPLETION_FILE; then + return + fi + if [[ $INSTALLED_WITHIN_DOCKER == "yes" ]]; then + # docker does its own firewalling + return + fi + if [[ $ONION_ONLY != "no" ]]; then + return + fi + iptables -A INPUT -p tcp --dport 5222:5223 -j ACCEPT + iptables -A INPUT -p tcp --dport 5269 -j ACCEPT + iptables -A INPUT -p tcp --dport 5280:5281 -j ACCEPT + function_check save_firewall_settings + save_firewall_settings - OPEN_PORTS+=('XMPP 5222-5223') - OPEN_PORTS+=('XMPP 5269') - OPEN_PORTS+=('XMPP 5280-5281') - echo 'configure_firewall_for_xmpp' >> $COMPLETION_FILE -} - -function update_prosody_modules { - if [ ! -d $INSTALL_DIR/prosody-modules ]; then - return - fi - if [ ! -d /usr/lib/prosody ]; then - return - fi - - cd $INSTALL_DIR/prosody-modules - hg pull - hg update - - # support onion addresses - if [ -f $INSTALL_DIR/prosody-modules/mod_onions/mod_onions.lua ]; then - cp $INSTALL_DIR/prosody-modules/mod_onions/mod_onions.lua /usr/lib/prosody/modules/mod_onions.lua - fi - - # XEP-0313 message archive management - # https://modules.prosody.im/mod_mam.html - # Allows you to download your previous messages onto a new client - # This only applies if you are not using forward secret crypto - # such as OTR or OMEMO (eg. OpenPGP) - if [ -d $INSTALL_DIR/prosody-modules/mod_mam ]; then - cp $INSTALL_DIR/prosody-modules/mod_mam/*.lua /usr/lib/prosody/modules - fi - - # XEP-0352 Client State Indication - # Notifies the server if the app is in the background or not - if [ -d $INSTALL_DIR/prosody-modules/mod_csi ]; then - cp $INSTALL_DIR/prosody-modules/mod_csi/*.lua /usr/lib/prosody/modules - fi - - # XEP-0280 Message Carbons - # Ensures all messages get delivered to all clients (if you have a mobile and desktop client) - if [ -d $INSTALL_DIR/prosody-modules/mod_carbons ]; then - cp $INSTALL_DIR/prosody-modules/mod_carbons/*.lua /usr/lib/prosody/modules - fi - - # XEP-0198 Stream management - # Helps mobile apps recover when a device switches networks. - if [ -d $INSTALL_DIR/prosody-modules/mod_smacks ]; then - cp $INSTALL_DIR/prosody-modules/mod_smacks/*.lua /usr/lib/prosody/modules - fi - if [ -d $INSTALL_DIR/prosody-modules/mod_smacks_offline ]; then - cp $INSTALL_DIR/prosody-modules/mod_smacks_offline/*.lua /usr/lib/prosody/modules - fi - - # XEP-0191: blocking - if [ -d $INSTALL_DIR/prosody-modules/mod_blocking ]; then - cp $INSTALL_DIR/prosody-modules/mod_blocking/*.lua /usr/lib/prosody/modules - fi - - # XEP-0016 Privacy lists - if [ -d $INSTALL_DIR/prosody-modules/mod_privacy_lists ]; then - cp $INSTALL_DIR/prosody-modules/mod_privacy_lists/*.lua /usr/lib/prosody/modules - fi + OPEN_PORTS+=('XMPP 5222-5223') + OPEN_PORTS+=('XMPP 5269') + OPEN_PORTS+=('XMPP 5280-5281') + echo 'configure_firewall_for_xmpp' >> $COMPLETION_FILE } function remove_xmpp_client { - if ! grep -Fxq "install_xmpp_client" $COMPLETION_FILE; then - return - fi - apt-get -y remove --purge profanity - sed '/install_xmpp_client/d' $COMPLETION_FILE + if ! grep -Fxq "install_xmpp_client" $COMPLETION_FILE; then + return + fi + apt-get -y remove --purge profanity + sed '/install_xmpp_client/d' $COMPLETION_FILE } function remove_xmpp { - remove_xmpp_client - if ! grep -Fxq "install_xmpp" $COMPLETION_FILE; then - return - fi - iptables -D INPUT -p tcp --dport 5222:5223 -j ACCEPT - iptables -D INPUT -p tcp --dport 5269 -j ACCEPT - iptables -D INPUT -p tcp --dport 5280:5281 -j ACCEPT - function_check save_firewall_settings - save_firewall_settings + remove_xmpp_client + if ! grep -Fxq "install_xmpp" $COMPLETION_FILE; then + return + fi + iptables -D INPUT -p tcp --dport 5222:5223 -j ACCEPT + iptables -D INPUT -p tcp --dport 5269 -j ACCEPT + iptables -D INPUT -p tcp --dport 5280:5281 -j ACCEPT + function_check save_firewall_settings + save_firewall_settings - function_check remove_onion_service - remove_onion_service xmpp 5222 5223 5269 + function_check remove_onion_service + remove_onion_service xmpp 5222 5223 5269 - apt-get -y remove --purge prosody prosody-modules - if [ -d $INSTALL_DIR/prosody-modules ]; then - rm -rf $INSTALL_DIR/prosody-modules - fi - if [ -d /etc/prosody ]; then - rm -rf /etc/prosody - fi + apt-get -y remove --purge prosody prosody-modules + if [ -d $INSTALL_DIR/prosody-modules ]; then + rm -rf $INSTALL_DIR/prosody-modules + fi + if [ -d /etc/prosody ]; then + rm -rf /etc/prosody + fi - sed '/install_xmpp/d' $COMPLETION_FILE - sed '/XMPP /d' $COMPLETION_FILE + sed '/install_xmpp/d' $COMPLETION_FILE + sed '/XMPP /d' $COMPLETION_FILE } function install_xmpp_main { - if [[ $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_SOCIAL" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_DEVELOPER" || $SYSTEM_TYPE == "$VARIANT_MESH" ]]; then - return - fi + if [[ $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_SOCIAL" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_DEVELOPER" || $SYSTEM_TYPE == "$VARIANT_MESH" ]]; then + return + fi - update_prosody_modules + update_prosody_modules - if grep -Fxq "install_xmpp_main" $COMPLETION_FILE; then - return - fi - apt-get -y install lua-sec lua-bitop - apt-get -y install prosody prosody-modules mercurial + if grep -Fxq "install_xmpp_main" $COMPLETION_FILE; then + return + fi + apt-get -y install lua-sec lua-bitop + apt-get -y install prosody prosody-modules mercurial - if [ ! -d /etc/prosody ]; then - echo $"ERROR: prosody does not appear to have installed. $CHECK_MESSAGE" - exit 52 - fi + if [ ! -d /etc/prosody ]; then + echo $"ERROR: prosody does not appear to have installed. $CHECK_MESSAGE" + exit 52 + fi - # obtain the prosody modules - cd $INSTALL_DIR - hg clone https://hg.prosody.im/prosody-modules/ prosody-modules - if [ ! -d $INSTALL_DIR/prosody-modules/mod_onions ]; then - echo $'mod_onions prosody module could not be found' - exit 73254 - fi + # obtain the prosody modules + cd $INSTALL_DIR + hg clone https://hg.prosody.im/prosody-modules/ prosody-modules + if [ ! -d $INSTALL_DIR/prosody-modules/mod_onions ]; then + echo $'mod_onions prosody module could not be found' + exit 73254 + fi - # install the onions module - update_prosody_modules - if [ ! -f /usr/lib/prosody/modules/mod_onions.lua ]; then - echo $'mod_onions.lua could not be copied to the prosody modules directory' - exit 63952 - fi + # install the onions module + update_prosody_modules + if [ ! -f /usr/lib/prosody/modules/mod_onions.lua ]; then + echo $'mod_onions.lua could not be copied to the prosody modules directory' + exit 63952 + fi - # create a certificate - if [ ! -f /etc/ssl/certs/xmpp.dhparam ]; then - ${PROJECT_NAME}-addcert -h xmpp --dhkey $DH_KEYLENGTH - check_certificates xmpp - fi - chown prosody:prosody /etc/ssl/private/xmpp.key - chown prosody:prosody /etc/ssl/certs/xmpp.* - cp -a /etc/prosody/conf.avail/example.com.cfg.lua /etc/prosody/conf.avail/xmpp.cfg.lua + # create a certificate + if [ ! -f /etc/ssl/certs/xmpp.dhparam ]; then + ${PROJECT_NAME}-addcert -h xmpp --dhkey $DH_KEYLENGTH + check_certificates xmpp + fi + chown prosody:prosody /etc/ssl/private/xmpp.key + chown prosody:prosody /etc/ssl/certs/xmpp.* + cp -a /etc/prosody/conf.avail/example.com.cfg.lua /etc/prosody/conf.avail/xmpp.cfg.lua - sed -i 's|/etc/prosody/certs/example.com.key|/etc/ssl/private/xmpp.key|g' /etc/prosody/conf.avail/xmpp.cfg.lua - sed -i 's|/etc/prosody/certs/example.com.crt|/etc/ssl/certs/xmpp.crt|g' /etc/prosody/conf.avail/xmpp.cfg.lua - if ! grep -q "xmpp.dhparam" /etc/prosody/conf.avail/xmpp.cfg.lua; then - sed -i '/certificate =/a\ dhparam = "/etc/ssl/certs/xmpp.dhparam";' /etc/prosody/conf.avail/xmpp.cfg.lua - fi - if ! grep -q 'options = {"no_sslv2", "no_sslv3" }' /etc/prosody/conf.avail/xmpp.cfg.lua; then - sed -i '/certificate =/a\ options = {"no_sslv2", "no_sslv3" };' /etc/prosody/conf.avail/xmpp.cfg.lua - fi - if ! grep -q 'ciphers =' /etc/prosody/conf.avail/xmpp.cfg.lua; then - sed -i "/certificate =/a\ ciphers = $XMPP_CIPHERS;" /etc/prosody/conf.avail/xmpp.cfg.lua - fi - if ! grep -q 'depth = "1";' /etc/prosody/conf.avail/xmpp.cfg.lua; then - sed -i '/certificate =/a\ depth = "1";' /etc/prosody/conf.avail/xmpp.cfg.lua - fi - if ! grep -q 'curve =' /etc/prosody/conf.avail/xmpp.cfg.lua; then - sed -i "/certificate =/a\ curve = $XMPP_ECC_CURVE;" /etc/prosody/conf.avail/xmpp.cfg.lua - fi + sed -i 's|/etc/prosody/certs/example.com.key|/etc/ssl/private/xmpp.key|g' /etc/prosody/conf.avail/xmpp.cfg.lua + sed -i 's|/etc/prosody/certs/example.com.crt|/etc/ssl/certs/xmpp.crt|g' /etc/prosody/conf.avail/xmpp.cfg.lua + if ! grep -q "xmpp.dhparam" /etc/prosody/conf.avail/xmpp.cfg.lua; then + sed -i '/certificate =/a\ dhparam = "/etc/ssl/certs/xmpp.dhparam";' /etc/prosody/conf.avail/xmpp.cfg.lua + fi + if ! grep -q 'options = {"no_sslv2", "no_sslv3" }' /etc/prosody/conf.avail/xmpp.cfg.lua; then + sed -i '/certificate =/a\ options = {"no_sslv2", "no_sslv3" };' /etc/prosody/conf.avail/xmpp.cfg.lua + fi + if ! grep -q 'ciphers =' /etc/prosody/conf.avail/xmpp.cfg.lua; then + sed -i "/certificate =/a\ ciphers = $XMPP_CIPHERS;" /etc/prosody/conf.avail/xmpp.cfg.lua + fi + if ! grep -q 'depth = "1";' /etc/prosody/conf.avail/xmpp.cfg.lua; then + sed -i '/certificate =/a\ depth = "1";' /etc/prosody/conf.avail/xmpp.cfg.lua + fi + if ! grep -q 'curve =' /etc/prosody/conf.avail/xmpp.cfg.lua; then + sed -i "/certificate =/a\ curve = $XMPP_ECC_CURVE;" /etc/prosody/conf.avail/xmpp.cfg.lua + fi - sed -i "s/example.com/$DEFAULT_DOMAIN_NAME/g" /etc/prosody/conf.avail/xmpp.cfg.lua - sed -i 's/enabled = false -- Remove this line to enable this host//g' /etc/prosody/conf.avail/xmpp.cfg.lua + sed -i "s/example.com/$DEFAULT_DOMAIN_NAME/g" /etc/prosody/conf.avail/xmpp.cfg.lua + sed -i 's/enabled = false -- Remove this line to enable this host//g' /etc/prosody/conf.avail/xmpp.cfg.lua - if ! grep -q "modules_enabled" /etc/prosody/conf.avail/xmpp.cfg.lua; then - echo '' >> /etc/prosody/conf.avail/xmpp.cfg.lua - echo 'modules_enabled = {' >> /etc/prosody/conf.avail/xmpp.cfg.lua - echo ' "bosh"; -- Enable mod_bosh' >> /etc/prosody/conf.avail/xmpp.cfg.lua - echo ' "tls"; -- Enable mod_tls' >> /etc/prosody/conf.avail/xmpp.cfg.lua - echo ' "saslauth"; -- Enable mod_saslauth' >> /etc/prosody/conf.avail/xmpp.cfg.lua - echo ' "onions"; -- Enable chat via onion service' >> /etc/prosody/conf.avail/xmpp.cfg.lua - echo ' "mam"; -- Message archive management' >> /etc/prosody/conf.avail/xmpp.cfg.lua - echo ' "csi"; -- Client state indication' >> /etc/prosody/conf.avail/xmpp.cfg.lua - echo ' "carbons"; -- Message carbons' >> /etc/prosody/conf.avail/xmpp.cfg.lua - echo ' "smacks"; -- Stream management' >> /etc/prosody/conf.avail/xmpp.cfg.lua - echo ' "smacks_offline"; -- Stream management' >> /etc/prosody/conf.avail/xmpp.cfg.lua - echo ' "pep"; -- Personal Eventing Protocol (to support OMEMO)' >> /etc/prosody/conf.avail/xmpp.cfg.lua - echo ' "privacy"; -- Privacy lists' >> /etc/prosody/conf.avail/xmpp.cfg.lua - echo ' "privacy_lists"; -- Privacy lists' >> /etc/prosody/conf.avail/xmpp.cfg.lua - echo ' "blocking"; -- Blocking command' >> /etc/prosody/conf.avail/xmpp.cfg.lua - echo ' "roster"; -- Roster versioning' >> /etc/prosody/conf.avail/xmpp.cfg.lua - echo '}' >> /etc/prosody/conf.avail/xmpp.cfg.lua - echo '' >> /etc/prosody/conf.avail/xmpp.cfg.lua - echo 'c2s_require_encryption = true' >> /etc/prosody/conf.avail/xmpp.cfg.lua - echo 's2s_require_encryption = true' >> /etc/prosody/conf.avail/xmpp.cfg.lua - echo 'allow_unencrypted_plain_auth = false' >> /etc/prosody/conf.avail/xmpp.cfg.lua - fi - ln -sf /etc/prosody/conf.avail/xmpp.cfg.lua /etc/prosody/conf.d/xmpp.cfg.lua + if ! grep -q "modules_enabled" /etc/prosody/conf.avail/xmpp.cfg.lua; then + echo '' >> /etc/prosody/conf.avail/xmpp.cfg.lua + echo 'modules_enabled = {' >> /etc/prosody/conf.avail/xmpp.cfg.lua + echo ' "bosh"; -- Enable mod_bosh' >> /etc/prosody/conf.avail/xmpp.cfg.lua + echo ' "tls"; -- Enable mod_tls' >> /etc/prosody/conf.avail/xmpp.cfg.lua + echo ' "saslauth"; -- Enable mod_saslauth' >> /etc/prosody/conf.avail/xmpp.cfg.lua + echo ' "onions"; -- Enable chat via onion service' >> /etc/prosody/conf.avail/xmpp.cfg.lua + echo ' "mam"; -- Message archive management' >> /etc/prosody/conf.avail/xmpp.cfg.lua + echo ' "csi"; -- Client state indication' >> /etc/prosody/conf.avail/xmpp.cfg.lua + echo ' "carbons"; -- Message carbons' >> /etc/prosody/conf.avail/xmpp.cfg.lua + echo ' "smacks"; -- Stream management' >> /etc/prosody/conf.avail/xmpp.cfg.lua + echo ' "smacks_offline"; -- Stream management' >> /etc/prosody/conf.avail/xmpp.cfg.lua + echo ' "pep"; -- Personal Eventing Protocol (to support OMEMO)' >> /etc/prosody/conf.avail/xmpp.cfg.lua + echo ' "privacy"; -- Privacy lists' >> /etc/prosody/conf.avail/xmpp.cfg.lua + echo ' "privacy_lists"; -- Privacy lists' >> /etc/prosody/conf.avail/xmpp.cfg.lua + echo ' "blocking"; -- Blocking command' >> /etc/prosody/conf.avail/xmpp.cfg.lua + echo ' "roster"; -- Roster versioning' >> /etc/prosody/conf.avail/xmpp.cfg.lua + echo '}' >> /etc/prosody/conf.avail/xmpp.cfg.lua + echo '' >> /etc/prosody/conf.avail/xmpp.cfg.lua + echo 'c2s_require_encryption = true' >> /etc/prosody/conf.avail/xmpp.cfg.lua + echo 's2s_require_encryption = true' >> /etc/prosody/conf.avail/xmpp.cfg.lua + echo 'allow_unencrypted_plain_auth = false' >> /etc/prosody/conf.avail/xmpp.cfg.lua + fi + ln -sf /etc/prosody/conf.avail/xmpp.cfg.lua /etc/prosody/conf.d/xmpp.cfg.lua - sed -i 's|/etc/prosody/certs/localhost.key|/etc/ssl/private/xmpp.key|g' /etc/prosody/prosody.cfg.lua - sed -i 's|/etc/prosody/certs/localhost.crt|/etc/ssl/certs/xmpp.crt|g' /etc/prosody/prosody.cfg.lua - if ! grep -q "xmpp.dhparam" /etc/prosody/prosody.cfg.lua; then - sed -i '/certificate =/a\ dhparam = "/etc/ssl/certs/xmpp.dhparam";' /etc/prosody/prosody.cfg.lua - fi - if ! grep -q 'options = {"no_sslv2", "no_sslv3" }' /etc/prosody/prosody.cfg.lua; then - sed -i '/certificate =/a\ options = {"no_sslv2", "no_sslv3" };' /etc/prosody/prosody.cfg.lua - fi - if ! grep -q 'ciphers =' /etc/prosody/prosody.cfg.lua; then - sed -i "/certificate =/a\ ciphers = $XMPP_CIPHERS;" /etc/prosody/prosody.cfg.lua - fi - if ! grep -q 'depth = "1";' /etc/prosody/prosody.cfg.lua; then - sed -i '/certificate =/a\ depth = "1";' /etc/prosody/prosody.cfg.lua - fi - if ! grep -q 'curve =' /etc/prosody/prosody.cfg.lua; then - sed -i "/certificate =/a\ curve = $XMPP_ECC_CURVE;" /etc/prosody/prosody.cfg.lua - fi - sed -i 's/c2s_require_encryption = false/c2s_require_encryption = true/g' /etc/prosody/prosody.cfg.lua - if ! grep -q "s2s_require_encryption" /etc/prosody/prosody.cfg.lua; then - sed -i '/c2s_require_encryption/a\s2s_require_encryption = true' /etc/prosody/prosody.cfg.lua - fi - if ! grep -q "allow_unencrypted_plain_auth" /etc/prosody/prosody.cfg.lua; then - echo 'allow_unencrypted_plain_auth = false' >> /etc/prosody/conf.avail/xmpp.cfg.lua - fi - sed -i 's/--"bosh";/"bosh";/g' /etc/prosody/prosody.cfg.lua - sed -i 's/authentication = "internal_plain"/authentication = "internal_hashed"/g' /etc/prosody/prosody.cfg.lua - sed -i 's/enabled = false -- Remove this line to enable this host//g' /etc/prosody/prosody.cfg.lua - sed -i 's|key = "/etc/prosody/certs/example.com.key"|key = "/etc/ssl/private/xmpp.key"|g' /etc/prosody/prosody.cfg.lua - sed -i 's|certificate = "/etc/prosody/certs/example.com.crt"|certificate = "/etc/ssl/certs/xmpp.crt"|g' /etc/prosody/prosody.cfg.lua - sed -i "s/example.com/$DEFAULT_DOMAIN_NAME/g" /etc/prosody/prosody.cfg.lua + sed -i 's|/etc/prosody/certs/localhost.key|/etc/ssl/private/xmpp.key|g' /etc/prosody/prosody.cfg.lua + sed -i 's|/etc/prosody/certs/localhost.crt|/etc/ssl/certs/xmpp.crt|g' /etc/prosody/prosody.cfg.lua + if ! grep -q "xmpp.dhparam" /etc/prosody/prosody.cfg.lua; then + sed -i '/certificate =/a\ dhparam = "/etc/ssl/certs/xmpp.dhparam";' /etc/prosody/prosody.cfg.lua + fi + if ! grep -q 'options = {"no_sslv2", "no_sslv3" }' /etc/prosody/prosody.cfg.lua; then + sed -i '/certificate =/a\ options = {"no_sslv2", "no_sslv3" };' /etc/prosody/prosody.cfg.lua + fi + if ! grep -q 'ciphers =' /etc/prosody/prosody.cfg.lua; then + sed -i "/certificate =/a\ ciphers = $XMPP_CIPHERS;" /etc/prosody/prosody.cfg.lua + fi + if ! grep -q 'depth = "1";' /etc/prosody/prosody.cfg.lua; then + sed -i '/certificate =/a\ depth = "1";' /etc/prosody/prosody.cfg.lua + fi + if ! grep -q 'curve =' /etc/prosody/prosody.cfg.lua; then + sed -i "/certificate =/a\ curve = $XMPP_ECC_CURVE;" /etc/prosody/prosody.cfg.lua + fi + sed -i 's/c2s_require_encryption = false/c2s_require_encryption = true/g' /etc/prosody/prosody.cfg.lua + if ! grep -q "s2s_require_encryption" /etc/prosody/prosody.cfg.lua; then + sed -i '/c2s_require_encryption/a\s2s_require_encryption = true' /etc/prosody/prosody.cfg.lua + fi + if ! grep -q "allow_unencrypted_plain_auth" /etc/prosody/prosody.cfg.lua; then + echo 'allow_unencrypted_plain_auth = false' >> /etc/prosody/conf.avail/xmpp.cfg.lua + fi + sed -i 's/--"bosh";/"bosh";/g' /etc/prosody/prosody.cfg.lua + sed -i 's/authentication = "internal_plain"/authentication = "internal_hashed"/g' /etc/prosody/prosody.cfg.lua + sed -i 's/enabled = false -- Remove this line to enable this host//g' /etc/prosody/prosody.cfg.lua + sed -i 's|key = "/etc/prosody/certs/example.com.key"|key = "/etc/ssl/private/xmpp.key"|g' /etc/prosody/prosody.cfg.lua + sed -i 's|certificate = "/etc/prosody/certs/example.com.crt"|certificate = "/etc/ssl/certs/xmpp.crt"|g' /etc/prosody/prosody.cfg.lua + sed -i "s/example.com/$DEFAULT_DOMAIN_NAME/g" /etc/prosody/prosody.cfg.lua - systemctl restart prosody - touch /home/$MY_USERNAME/README + systemctl restart prosody + touch /home/$MY_USERNAME/README - if [ ! -d /var/lib/tor ]; then - echo $'No Tor installation found. XMPP onion site cannot be configured.' - exit 877367 - fi - if ! grep -q "hidden_service_xmpp" /etc/tor/torrc; then - echo 'HiddenServiceDir /var/lib/tor/hidden_service_xmpp/' >> /etc/tor/torrc - echo "HiddenServicePort 5222 127.0.0.1:5222" >> /etc/tor/torrc - echo "HiddenServicePort 5269 127.0.0.1:5269" >> /etc/tor/torrc - echo $'Added onion site for XMPP chat' - fi + if [ ! -d /var/lib/tor ]; then + echo $'No Tor installation found. XMPP onion site cannot be configured.' + exit 877367 + fi + if ! grep -q "hidden_service_xmpp" /etc/tor/torrc; then + echo 'HiddenServiceDir /var/lib/tor/hidden_service_xmpp/' >> /etc/tor/torrc + echo "HiddenServicePort 5222 127.0.0.1:5222" >> /etc/tor/torrc + echo "HiddenServicePort 5269 127.0.0.1:5269" >> /etc/tor/torrc + echo $'Added onion site for XMPP chat' + fi - systemctl restart tor - wait_for_onion_service 'xmpp' + systemctl restart tor + wait_for_onion_service 'xmpp' - if [ ! -f /var/lib/tor/hidden_service_xmpp/hostname ]; then - echo $'XMPP onion site hostname not found' - exit 65349 - fi - XMPP_ONION_HOSTNAME=$(cat /var/lib/tor/hidden_service_xmpp/hostname) - if ! grep -q "${XMPP_ONION_HOSTNAME}" /etc/prosody/conf.avail/xmpp.cfg.lua; then - echo '' >> /etc/prosody/conf.avail/xmpp.cfg.lua - echo "VirtualHost \"${XMPP_ONION_HOSTNAME}\"" >> /etc/prosody/conf.avail/xmpp.cfg.lua - echo ' modules_enabled = { "onions" };' >> /etc/prosody/conf.avail/xmpp.cfg.lua - fi - if ! grep -q "XMPP onion domain" $COMPLETION_FILE; then - echo "XMPP onion domain:${XMPP_ONION_HOSTNAME}" >> $COMPLETION_FILE - else - sed -i "s|XMPP onion domain.*|XMPP onion domain:${XMPP_ONION_HOSTNAME}|g" $COMPLETION_FILE - fi + if [ ! -f /var/lib/tor/hidden_service_xmpp/hostname ]; then + echo $'XMPP onion site hostname not found' + exit 65349 + fi + XMPP_ONION_HOSTNAME=$(cat /var/lib/tor/hidden_service_xmpp/hostname) + if ! grep -q "${XMPP_ONION_HOSTNAME}" /etc/prosody/conf.avail/xmpp.cfg.lua; then + echo '' >> /etc/prosody/conf.avail/xmpp.cfg.lua + echo "VirtualHost \"${XMPP_ONION_HOSTNAME}\"" >> /etc/prosody/conf.avail/xmpp.cfg.lua + echo ' modules_enabled = { "onions" };' >> /etc/prosody/conf.avail/xmpp.cfg.lua + fi + if ! grep -q "XMPP onion domain" $COMPLETION_FILE; then + echo "XMPP onion domain:${XMPP_ONION_HOSTNAME}" >> $COMPLETION_FILE + else + sed -i "s|XMPP onion domain.*|XMPP onion domain:${XMPP_ONION_HOSTNAME}|g" $COMPLETION_FILE + fi - if ! grep -q "Your XMPP password is" /home/$MY_USERNAME/README; then - if [ ${#XMPP_PASSWORD} -lt 8 ]; then - if [ -f $IMAGE_PASSWORD_FILE ]; then - XMPP_PASSWORD="$(printf `cat $IMAGE_PASSWORD_FILE`)" - else - XMPP_PASSWORD="$(create_password ${MINIMUM_PASSWORD_LENGTH})" - fi - fi - prosodyctl register $MY_USERNAME $DEFAULT_DOMAIN_NAME $XMPP_PASSWORD - echo '' >> /home/$MY_USERNAME/README - echo '' >> /home/$MY_USERNAME/README - echo $'XMPP' >> /home/$MY_USERNAME/README - echo '====' >> /home/$MY_USERNAME/README - echo $"XMPP onion domain: ${XMPP_ONION_HOSTNAME}" >> /home/$MY_USERNAME/README - echo $"Your XMPP password is: $XMPP_PASSWORD" >> /home/$MY_USERNAME/README - echo $'You can change it with: ' >> /home/$MY_USERNAME/README - echo '' >> /home/$MY_USERNAME/README - echo " prosodyctl passwd $MY_EMAIL_ADDRESS" >> /home/$MY_USERNAME/README - chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/README - chmod 600 /home/$MY_USERNAME/README - fi + if ! grep -q "Your XMPP password is" /home/$MY_USERNAME/README; then + if [ ${#XMPP_PASSWORD} -lt 8 ]; then + if [ -f $IMAGE_PASSWORD_FILE ]; then + XMPP_PASSWORD="$(printf `cat $IMAGE_PASSWORD_FILE`)" + else + XMPP_PASSWORD="$(create_password ${MINIMUM_PASSWORD_LENGTH})" + fi + fi + prosodyctl register $MY_USERNAME $DEFAULT_DOMAIN_NAME $XMPP_PASSWORD + echo '' >> /home/$MY_USERNAME/README + echo '' >> /home/$MY_USERNAME/README + echo $'XMPP' >> /home/$MY_USERNAME/README + echo '====' >> /home/$MY_USERNAME/README + echo $"XMPP onion domain: ${XMPP_ONION_HOSTNAME}" >> /home/$MY_USERNAME/README + echo $"Your XMPP password is: $XMPP_PASSWORD" >> /home/$MY_USERNAME/README + echo $'You can change it with: ' >> /home/$MY_USERNAME/README + echo '' >> /home/$MY_USERNAME/README + echo " prosodyctl passwd $MY_EMAIL_ADDRESS" >> /home/$MY_USERNAME/README + chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/README + chmod 600 /home/$MY_USERNAME/README + fi - function_check configure_firewall_for_xmpp - configure_firewall_for_xmpp + function_check configure_firewall_for_xmpp + configure_firewall_for_xmpp - echo 'install_xmpp_main' >> $COMPLETION_FILE + echo 'install_xmpp_main' >> $COMPLETION_FILE } function install_xmpp_client { - if [[ $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_SOCIAL" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_DEVELOPER" || $SYSTEM_TYPE == "$VARIANT_MESH" ]]; then - return - fi - if grep -Fxq "install_xmpp_client" $COMPLETION_FILE; then - return - fi - apt-get -y install profanity + if [[ $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_SOCIAL" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_DEVELOPER" || $SYSTEM_TYPE == "$VARIANT_MESH" ]]; then + return + fi + if grep -Fxq "install_xmpp_client" $COMPLETION_FILE; then + return + fi + apt-get -y install profanity - XMPP_CLIENT_DIR=/home/$MY_USERNAME/.local/share/profanity - XMPP_CLIENT_ACCOUNTS=$XMPP_CLIENT_DIR/accounts - if [ ! -d $XMPP_CLIENT_DIR ]; then - mkdir -p $XMPP_CLIENT_DIR - fi + XMPP_CLIENT_DIR=/home/$MY_USERNAME/.local/share/profanity + XMPP_CLIENT_ACCOUNTS=$XMPP_CLIENT_DIR/accounts + if [ ! -d $XMPP_CLIENT_DIR ]; then + mkdir -p $XMPP_CLIENT_DIR + fi - if [[ $ONION_ONLY == 'no' ]]; then - echo "[${MY_USERNAME}@${DEFAULT_DOMAIN_NAME}]" > $XMPP_CLIENT_ACCOUNTS - echo 'enabled=true' >> $XMPP_CLIENT_ACCOUNTS - echo "jid=${MY_USERNAME}@${DEFAULT_DOMAIN_NAME}" >> $XMPP_CLIENT_ACCOUNTS - echo 'resource=profanity' >> $XMPP_CLIENT_ACCOUNTS - echo "muc.service=conference.${DEFAULT_DOMAIN_NAME}" >> $XMPP_CLIENT_ACCOUNTS - echo "muc.nick=${MY_USERNAME}" >> $XMPP_CLIENT_ACCOUNTS - echo 'presence.last=online' >> $XMPP_CLIENT_ACCOUNTS - echo 'presence.login=online' >> $XMPP_CLIENT_ACCOUNTS - echo 'priority.online=0' >> $XMPP_CLIENT_ACCOUNTS - echo 'priority.chat=0' >> $XMPP_CLIENT_ACCOUNTS - echo 'priority.away=0' >> $XMPP_CLIENT_ACCOUNTS - echo 'priority.xa=0' >> $XMPP_CLIENT_ACCOUNTS - echo 'priority.dnd=0' >> $XMPP_CLIENT_ACCOUNTS - if [ ${#XMPP_PASSWORD} -gt 2 ]; then - echo "password=$XMPP_PASSWORD" >> $XMPP_CLIENT_ACCOUNTS - fi - fi + if [[ $ONION_ONLY == 'no' ]]; then + echo "[${MY_USERNAME}@${DEFAULT_DOMAIN_NAME}]" > $XMPP_CLIENT_ACCOUNTS + echo 'enabled=true' >> $XMPP_CLIENT_ACCOUNTS + echo "jid=${MY_USERNAME}@${DEFAULT_DOMAIN_NAME}" >> $XMPP_CLIENT_ACCOUNTS + echo 'resource=profanity' >> $XMPP_CLIENT_ACCOUNTS + echo "muc.service=conference.${DEFAULT_DOMAIN_NAME}" >> $XMPP_CLIENT_ACCOUNTS + echo "muc.nick=${MY_USERNAME}" >> $XMPP_CLIENT_ACCOUNTS + echo 'presence.last=online' >> $XMPP_CLIENT_ACCOUNTS + echo 'presence.login=online' >> $XMPP_CLIENT_ACCOUNTS + echo 'priority.online=0' >> $XMPP_CLIENT_ACCOUNTS + echo 'priority.chat=0' >> $XMPP_CLIENT_ACCOUNTS + echo 'priority.away=0' >> $XMPP_CLIENT_ACCOUNTS + echo 'priority.xa=0' >> $XMPP_CLIENT_ACCOUNTS + echo 'priority.dnd=0' >> $XMPP_CLIENT_ACCOUNTS + if [ ${#XMPP_PASSWORD} -gt 2 ]; then + echo "password=$XMPP_PASSWORD" >> $XMPP_CLIENT_ACCOUNTS + fi + fi - if [ -f /var/lib/tor/hidden_service_xmpp/hostname ]; then - XMPP_ONION_HOSTNAME=$(cat /var/lib/tor/hidden_service_xmpp/hostname) - echo "[${MY_USERNAME}@${XMPP_ONION_HOSTNAME}]" >> $XMPP_CLIENT_ACCOUNTS - if [[ $ONION_ONLY == 'no' ]]; then - echo 'enabled=false' >> $XMPP_CLIENT_ACCOUNTS - else - echo 'enabled=true' >> $XMPP_CLIENT_ACCOUNTS - fi - echo "jid=${MY_USERNAME}@${XMPP_ONION_HOSTNAME}" >> $XMPP_CLIENT_ACCOUNTS - echo 'resource=profanity' >> $XMPP_CLIENT_ACCOUNTS - echo "muc.service=conference.${XMPP_ONION_HOSTNAME}" >> $XMPP_CLIENT_ACCOUNTS - echo "muc.nick=${MY_USERNAME}" >> $XMPP_CLIENT_ACCOUNTS - echo 'presence.last=online' >> $XMPP_CLIENT_ACCOUNTS - echo 'presence.login=online' >> $XMPP_CLIENT_ACCOUNTS - echo 'priority.online=0' >> $XMPP_CLIENT_ACCOUNTS - echo 'priority.chat=0' >> $XMPP_CLIENT_ACCOUNTS - echo 'priority.away=0' >> $XMPP_CLIENT_ACCOUNTS - echo 'priority.xa=0' >> $XMPP_CLIENT_ACCOUNTS - echo 'priority.dnd=0' >> $XMPP_CLIENT_ACCOUNTS - if [ ${#XMPP_PASSWORD} -gt 2 ]; then - echo "password=$XMPP_PASSWORD" >> $XMPP_CLIENT_ACCOUNTS - fi - fi + if [ -f /var/lib/tor/hidden_service_xmpp/hostname ]; then + XMPP_ONION_HOSTNAME=$(cat /var/lib/tor/hidden_service_xmpp/hostname) + echo "[${MY_USERNAME}@${XMPP_ONION_HOSTNAME}]" >> $XMPP_CLIENT_ACCOUNTS + if [[ $ONION_ONLY == 'no' ]]; then + echo 'enabled=false' >> $XMPP_CLIENT_ACCOUNTS + else + echo 'enabled=true' >> $XMPP_CLIENT_ACCOUNTS + fi + echo "jid=${MY_USERNAME}@${XMPP_ONION_HOSTNAME}" >> $XMPP_CLIENT_ACCOUNTS + echo 'resource=profanity' >> $XMPP_CLIENT_ACCOUNTS + echo "muc.service=conference.${XMPP_ONION_HOSTNAME}" >> $XMPP_CLIENT_ACCOUNTS + echo "muc.nick=${MY_USERNAME}" >> $XMPP_CLIENT_ACCOUNTS + echo 'presence.last=online' >> $XMPP_CLIENT_ACCOUNTS + echo 'presence.login=online' >> $XMPP_CLIENT_ACCOUNTS + echo 'priority.online=0' >> $XMPP_CLIENT_ACCOUNTS + echo 'priority.chat=0' >> $XMPP_CLIENT_ACCOUNTS + echo 'priority.away=0' >> $XMPP_CLIENT_ACCOUNTS + echo 'priority.xa=0' >> $XMPP_CLIENT_ACCOUNTS + echo 'priority.dnd=0' >> $XMPP_CLIENT_ACCOUNTS + if [ ${#XMPP_PASSWORD} -gt 2 ]; then + echo "password=$XMPP_PASSWORD" >> $XMPP_CLIENT_ACCOUNTS + fi + fi - if [ ! -d /home/$MY_USERNAME/.config/profanity ]; then - mkdir /home/$MY_USERNAME/.config/profanity - fi - echo '[connection]' > /home/$MY_USERNAME/.config/profanity/profrc - echo "account=${MY_USERNAME}@${DEFAULT_DOMAIN_NAME}" >> /home/$MY_USERNAME/.config/profanity/profrc + if [ ! -d /home/$MY_USERNAME/.config/profanity ]; then + mkdir /home/$MY_USERNAME/.config/profanity + fi + echo '[connection]' > /home/$MY_USERNAME/.config/profanity/profrc + echo "account=${MY_USERNAME}@${DEFAULT_DOMAIN_NAME}" >> /home/$MY_USERNAME/.config/profanity/profrc - chown -R $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/.local - chown -R $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/.config + chown -R $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/.local + chown -R $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/.config - echo 'install_xmpp_client' >> $COMPLETION_FILE + echo 'install_xmpp_client' >> $COMPLETION_FILE } function install_xmpp { - if grep -Fxq "install_xmpp" $COMPLETION_FILE; then - return - fi - install_xmpp_main - install_xmpp_client - echo 'install_xmpp' >> $COMPLETION_FILE + if grep -Fxq "install_xmpp" $COMPLETION_FILE; then + return + fi + install_xmpp_main + install_xmpp_client + echo 'install_xmpp' >> $COMPLETION_FILE } # NOTE: deliberately no exit 0 diff --git a/src/freedombone-app-zeronet b/src/freedombone-app-zeronet index 29bf2a4c..4e1528c2 100755 --- a/src/freedombone-app-zeronet +++ b/src/freedombone-app-zeronet @@ -46,7 +46,14 @@ ZERONET_ID_REPO="https://github.com/HelloZeroNet/ZeroID" ZERONET_ID_COMMIT='ccf14fdc96fa9cdb2ddd8a7ab283a8e17a4f234b' function upgrade_zeronet { - echo '' + if ! grep -Fxq "install_zeronet" $COMPLETION_FILE; then + return + fi + function_check set_repo_commit + set_repo_commit $MESH_INSTALL_DIR/zeronet "ZeroNet commit" "$ZERONET_COMMIT" $ZERONET_REPO + set_repo_commit $MESH_INSTALL_DIR/zeronet/ZeroBlog "ZeroNet Blog commit" "$ZERONET_BLOG_COMMIT" $ZERONET_BLOG_REPO + set_repo_commit $MESH_INSTALL_DIR/zeronet/ZeroMail "ZeroNet Mail commit" "$ZERONET_MAIL_COMMIT" $ZERONET_MAIL_REPO + set_repo_commit $MESH_INSTALL_DIR/zeronet/ZeroTalk "ZeroNet Forum commit" "$ZERONET_FORUM_COMMIT" $ZERONET_FORUM_REPO } function backup_local_zeronet { @@ -135,9 +142,6 @@ function install_zeronet_blog { return fi - function_check set_repo_commit - set_repo_commit $MESH_INSTALL_DIR/zeronet/ZeroBlog "ZeroNet Blog commit" "$ZERONET_BLOG_COMMIT" $ZERONET_BLOG_REPO - if grep -Fxq "install_zeronet_blog" $COMPLETION_FILE; then return fi @@ -241,9 +245,6 @@ function install_zeronet_mail { return fi - function_check set_repo_commit - set_repo_commit $MESH_INSTALL_DIR/zeronet/ZeroMail "ZeroNet Mail commit" "$ZERONET_MAIL_COMMIT" $ZERONET_MAIL_REPO - if grep -Fxq "install_zeronet_mail" $COMPLETION_FILE; then return fi @@ -347,10 +348,6 @@ function install_zeronet_forum { return fi - # update to the next commit - function_check set_repo_commit - set_repo_commit $MESH_INSTALL_DIR/zeronet/ZeroTalk "ZeroNet Forum commit" "$ZERONET_FORUM_COMMIT" $ZERONET_FORUM_REPO - if grep -Fxq "install_zeronet_forum" $COMPLETION_FILE; then return fi @@ -448,10 +445,6 @@ function install_zeronet_main { return fi - # update to the next commit - function_check set_repo_commit - set_repo_commit $MESH_INSTALL_DIR/zeronet "ZeroNet commit" "$ZERONET_COMMIT" $ZERONET_REPO - if grep -Fxq "install_zeronet_main" $COMPLETION_FILE; then return fi