Merge branch 'stretch' of https://github.com/bashrc/freedombone

src/freedombone-app-bludit

 BLUDIT_REPO="https://github.com/bludit/bludit"
 BLUDIT_COMMIT='0e27e31a84421b3e6bd000a77bc89c2dff3c446a'
 
-BLUDIT_SHORT_DESCRIPTION=$'Bludit Blog'
+BLUDIT_SHORT_DESCRIPTION=$'Markdown blogging'
 BLUDIT_DESCRIPTION=$'Simple Markdown blogging'
 BLUDIT_MOBILE_APP_URL=
 

src/freedombone-app-cryptpad

 CRYPTPAD_PORT=9003
 CRYPTPAD_PORT2=9005
 CRYPTPAD_REPO="https://github.com/xwiki-labs/cryptpad"
-CRYPTPAD_COMMIT='cfc9ce33d6c7034a13cb0e6d606de6fba38697e0'
+CRYPTPAD_COMMIT='fe202a92b490404e3d8b7b8a2712e2e0a33a9851'
 CRYPTPAD_DIR=/etc/cryptpad
 
 cryptpad_variables=(ONION_ONLY)
     cryptpad_create_config
     npm upgrade
     npm install
-    su -c 'echo "2" | bower update' - cryptpad
-    su -c 'bower install --config.interactive=false' - cryptpad
+    rm -rf $CRYPTPAD_DIR/.cache/bower
+    su -c './node_modules/bower/bin/bower install --config.interactive=false' - cryptpad
+    su -c './node_modules/bower/bin/bower update --config.interactive=false' - cryptpad
     cryptpad_generate_api_config
     chown -R cryptpad:cryptpad $CRYPTPAD_DIR
 
       echo "    try_files /customize/\$uri /customize.dist/\$uri;";
       echo '  }';
       echo '  location = /api/config {';
-      echo '    default_type text/javascript;';
-      echo '    rewrite ^.*$ /customize/api/config break;';
+      echo "    proxy_pass http://localhost:$CRYPTPAD_PORT;";
+      echo "    proxy_set_header X-Real-IP \$remote_addr;";
+      echo "    proxy_set_header Host \$host;";
+      echo "    proxy_set_header X-Forwarded-For \$proxy_add_x_forwarded_for;";
       echo '  }';
       echo '';
       echo '  location ^~ /blob/ {';
+      echo '    add_header Cache-Control max-age=31536000;';
+      echo "    try_files \$uri =404;";
+      echo '  }';
+      echo '';
+      echo '  location ^~ /datastore/ {';
+      echo '    add_header Cache-Control max-age=0;';
       echo "    try_files \$uri =404;";
       echo '  }';
       echo '';
 
     cat <<EOF > "$rootdir/usr/bin/install_cryptpad"
 #!/bin/bash
-cd $CRYPTPAD_DIR
+cd $CRYPTPAD_DIR || exit 358735
 npm install --arch=$NPM_ARCH --build-from-source
-npm install --arch=$NPM_ARCH -g bower@1.8.0
+npm install --arch=$NPM_ARCH bower@1.8.4
 chown -R cryptpad:cryptpad $CRYPTPAD_DIR
-su -c 'bower install' - cryptpad
+su -c './node_modules/bower/bin/bower install --config.interactive=false' - cryptpad
 cp config.example.js config.js
 EOF
     chmod +x "$rootdir/usr/bin/install_cryptpad"
       echo "    try_files /customize/\$uri /customize.dist/\$uri;";
       echo '  }';
       echo '  location = /api/config {';
-      echo '    default_type text/javascript;';
-      echo '    rewrite ^.*$ /customize/api/config break;';
+      echo "    proxy_pass http://localhost:$CRYPTPAD_PORT;";
+      echo "    proxy_set_header X-Real-IP \$remote_addr;";
+      echo "    proxy_set_header Host \$host;";
+      echo "    proxy_set_header X-Forwarded-For \$proxy_add_x_forwarded_for;";
       echo '  }';
       echo '';
       echo '  location ^~ /blob/ {';
+      echo '    add_header Cache-Control max-age=31536000;';
+      echo "    try_files \$uri =404;";
+      echo '  }';
+      echo '';
+      echo '  location ^~ /datastore/ {';
+      echo '    add_header Cache-Control max-age=0;';
       echo "    try_files \$uri =404;";
       echo '  }';
       echo '';
     cd $CRYPTPAD_DIR || exit 35483548
 
     npm install
-    npm install -g bower@1.8.0
+    npm install bower@1.8.4
     chown -R cryptpad:cryptpad $CRYPTPAD_DIR
-    su -c 'bower install' - cryptpad
+    su -c './node_modules/bower/bin/bower install --config.interactive=false' - cryptpad
+    su -c './node_modules/bower/bin/bower update --config.interactive=false' - cryptpad
     cp config.example.js config.js
     if [ ! -f config.js ]; then
         echo $'Cryptpad config file not found'
     systemctl daemon-reload
     systemctl start cryptpad.service
 
-    sleep 6
+    sleep 8
 
     cryptpad_generate_api_config
 
     # install again
     cd $CRYPTPAD_DIR || exit 73537453
-    su -c 'bower install' - cryptpad
+    su -c './node_modules/bower/bin/bower install --config.interactive=false' - cryptpad
 
     systemctl restart nginx
 

src/freedombone-app-dlna

 IN_DEFAULT_INSTALL=0
 SHOW_ON_ABOUT=0
 
-DLNA_SHORT_DESCRIPTION=$'DLNA media'
-DLNA_DESCRIPTION=$'DLNA media'
+DLNA_SHORT_DESCRIPTION=$'Streaming media'
+DLNA_DESCRIPTION=$'Streaming media'
 DLNA_MOBILE_APP_URL=
 
 dlna_variables=(SYSTEM_TYPE

src/freedombone-app-dokuwiki

 DOKUWIKI_REPO="https://github.com/splitbrain/dokuwiki"
 DOKUWIKI_COMMIT='be15c01c0b982cf1a75b5af031bf077143c63f39'
 
-DOKUWIKI_SHORT_DESCRIPTION=$'Dokuwiki'
-DOKUWIKI_DESCRIPTION=$'Dokuwiki databaseless wiki'
+DOKUWIKI_SHORT_DESCRIPTION=$'Databaseless wiki'
+DOKUWIKI_DESCRIPTION=$'Databaseless wiki'
 DOKUWIKI_MOBILE_APP_URL=
 
 dokuwiki_variables=(ONION_ONLY

src/freedombone-app-edith

 EDITH_ONION_PORT=8278
 EDITH_LOGIN_TEXT=$"Edith login"
 
-EDITH_SHORT_DESCRIPTION=$'Edith Notes'
+EDITH_SHORT_DESCRIPTION=$'Simple notes'
 EDITH_DESCRIPTION=$'Extremely simple note taking'
 EDITH_MOBILE_APP_URL=
 

src/freedombone-app-etherpad

 ETHERPAD_TITLE=$'Freedombone Docs'
 ETHERPAD_WELCOME_MESSAGE=$"Welcome to ${ETHERPAD_TITLE}!\\n\\nThis pad text is synchronized as you type, so that everyone viewing this page sees the same text. This allows you to collaborate seamlessly on documents!"
 
-ETHERPAD_SHORT_DESCRIPTION=$'Etherpad'
-ETHERPAD_DESCRIPTION=$'Etherpad'
+ETHERPAD_SHORT_DESCRIPTION=$'Collaborative document editor'
+ETHERPAD_DESCRIPTION=$'Collaborative document editor'
 ETHERPAD_MOBILE_APP_URL=
 
 etherpad_variables=(ONION_ONLY

src/freedombone-app-fedwiki

 FEDWIKI_DATA=/var/lib/fedwiki
 FEDWIKI_COOKIE=
 
-FEDWIKI_SHORT_DESCRIPTION=$'FedWiki'
-FEDWIKI_DESCRIPTION=$'Federated Wiki'
+FEDWIKI_SHORT_DESCRIPTION=$'Federated wiki'
+FEDWIKI_DESCRIPTION=$'Federated wiki'
 FEDWIKI_MOBILE_APP_URL=
 
 fedwiki_variables=(FEDWIKI_DOMAIN_NAME

src/freedombone-app-friendica

 FRIENDICA_COMMIT='b5a42c5b31fae5315bacd37769eba20ab2345aaa'
 FRIENDICA_ADDONS_COMMIT='7cb9dbdda7f227462895c07be3c968405561d40e'
 
-FRIENDICA_SHORT_DESCRIPTION=$'Friendica'
-FRIENDICA_DESCRIPTION=$'Friendica federated social network'
+FRIENDICA_SHORT_DESCRIPTION=$'Federated social network'
+FRIENDICA_DESCRIPTION=$'Federated social network'
 FRIENDICA_MOBILE_APP_URL=
 
 friendica_variables=(ONION_ONLY

src/freedombone-app-gnusocial

 # Number of months after which posts expire
 GNUSOCIAL_EXPIRE_MONTHS=3
 
-GNUSOCIAL_SHORT_DESCRIPTION=$'GNU Social'
-GNUSOCIAL_DESCRIPTION=$'GNU Social federated microblogging'
+GNUSOCIAL_SHORT_DESCRIPTION=$'Federated microblogging'
+GNUSOCIAL_DESCRIPTION=$'Federated microblogging'
 GNUSOCIAL_MOBILE_APP_URL='https://f-droid.org/packages/org.mariotaku.twidere/'
 
 gnusocial_variables=(ONION_ONLY

src/freedombone-app-gogs

 GOGS_BIN=
 GOGS_PORT=3145
 
-GOGS_SHORT_DESCRIPTION=$'Gogs'
-GOGS_DESCRIPTION=$'Gogs git repo management'
+GOGS_SHORT_DESCRIPTION=$'Git repo management'
+GOGS_DESCRIPTION=$'Git repo management'
 GOGS_MOBILE_APP_URL=
 
 gogs_variables=(ONION_ONLY

src/freedombone-app-htmly

 HTMLY_TITLE="My Blog"
 HTMLY_SUBTITLE="Another ${PROJECT_NAME} blog"
 
-HTMLY_SHORT_DESCRIPTION=$'HTMLy'
-HTMLY_DESCRIPTION=$'HTMLy databaseless blogging'
+HTMLY_SHORT_DESCRIPTION=$'Databaseless blogging'
+HTMLY_DESCRIPTION=$'Databaseless blogging'
 HTMLY_MOBILE_APP_URL=
 
 htmly_variables=(HTMLY_REPO

src/freedombone-app-hubzilla

 HUBZILLA_ADDONS_COMMIT='be9dcd044b9326c3bd9301d7c4b375a2c2f54663'
 HUBZILLA_ADMIN_PASSWORD=
 
-HUBZILLA_SHORT_DESCRIPTION=$'Hubzilla'
-HUBZILLA_DESCRIPTION=$'Hubzilla'
+HUBZILLA_SHORT_DESCRIPTION=$'Web publishing system'
+HUBZILLA_DESCRIPTION=$'Web publishing system'
 HUBZILLA_MOBILE_APP_URL=
 
 hubzilla_variables=(ONION_ONLY

src/freedombone-app-icecast

 ICECAST_PLAYLIST_FILE=/etc/ices2/playlist.txt
 ICECAST_LOGIN_TEXT=$"Icecast login"
 
-ICECAST_SHORT_DESCRIPTION=$'Icecast'
-ICECAST_DESCRIPTION=$'Icecast'
+ICECAST_SHORT_DESCRIPTION=$'Media broadcast'
+ICECAST_DESCRIPTION=$'Media broadcast'
 ICECAST_MOBILE_APP_URL=
 
 icecast_variables=(MY_USERNAME

src/freedombone-app-irc

 # Number of entries for the bouncer to buffer
 IRC_BUFFER_LENGTH=300
 
-IRC_SHORT_DESCRIPTION=$'IRC'
-IRC_DESCRIPTION=$'IRC'
+IRC_SHORT_DESCRIPTION=$'Classic chat system'
+IRC_DESCRIPTION=$'Classic chat system'
 IRC_MOBILE_APP_URL='https://f-droid.org/packages/org.yaaic'
 
 irc_variables=(MY_USERNAME

src/freedombone-app-jitsi

 JITSI_CODE=
 JITSI_ONION_HOSTNAME=
 
-JITSI_SHORT_DESCRIPTION=$'Jitsi'
-JITSI_DESCRIPTION=$'Jitsi'
+JITSI_SHORT_DESCRIPTION=$'Video conferencing'
+JITSI_DESCRIPTION=$'Video conferencing'
 JITSI_MOBILE_APP_URL=
 
 jitsi_variables=(ONION_ONLY

src/freedombone-app-kanboard

 KANBOARD_COMMIT='7a6b1bc3da0af442e02b5a2dc430a4ded8e7c4ee'
 KANBOARD_ADMIN_PASSWORD=
 
-KANBOARD_SHORT_DESCRIPTION=$'Kanboard'
-KANBOARD_DESCRIPTION=$'Kanboard kanban'
+KANBOARD_SHORT_DESCRIPTION=$'Simple kanban'
+KANBOARD_DESCRIPTION=$'Simple kanban'
 KANBOARD_MOBILE_APP_URL=
 
 kanboard_variables=(ONION_ONLY

src/freedombone-app-koel

 KOEL_COMMIT='8e9b021aa09f2b1460977bdd52fff14ea2bc1607'
 KOEL_ADMIN_PASSWORD=
 
-KOEL_SHORT_DESCRIPTION=$'Koel music'
-KOEL_DESCRIPTION=$'Koel music player'
+KOEL_SHORT_DESCRIPTION=$'Music player'
+KOEL_DESCRIPTION=$'Music player'
 KOEL_MOBILE_APP_URL=
 
 koel_variables=(ONION_ONLY

src/freedombone-app-lychee

 LYCHEE_REPO="https://github.com/electerious/Lychee"
 LYCHEE_COMMIT='27f207dcbac8488629ffc3b5a9cac78ae123bee9'
 
-LYCHEE_SHORT_DESCRIPTION=$'Lychee photos'
-LYCHEE_DESCRIPTION=$'Lychee photos'
+LYCHEE_SHORT_DESCRIPTION=$'Photo album'
+LYCHEE_DESCRIPTION=$'Photo album'
 LYCHEE_MOBILE_APP_URL=
 
 lychee_variables=(LYCHEE_REPO

src/freedombone-app-mailpile

 MAILPILE_COMMIT='4f28f1bb55b3b9985f22ab6372d539b1087482dd'
 MAILPILE_PORT=33411
 
-MAILPILE_SHORT_DESCRIPTION=$'Mailpile'
-MAILPILE_DESCRIPTION=$'Mailpile email client'
+MAILPILE_SHORT_DESCRIPTION=$'Email system'
+MAILPILE_DESCRIPTION=$'Email system'
 MAILPILE_MOBILE_APP_URL=
 
 mailpile_variables=(MAILPILE_REPO

src/freedombone-app-matrix

 MATRIX_SECRET=
 MATRIX_EXPIRE_MONTHS=1
 
-MATRIX_SHORT_DESCRIPTION=$'Matrix chat'
-MATRIX_DESCRIPTION=$'Matrix chat'
+MATRIX_SHORT_DESCRIPTION=$'Chat system'
+MATRIX_DESCRIPTION=$'Chat system'
 MATRIX_MOBILE_APP_URL='https://f-droid.org/packages/im.vector.alpha'
 
 matrix_variables=(ONION_ONLY

src/freedombone-app-mediagoblin

 MEDIAGOBLIN_BASE_DIR=/var/www/mediagoblin.local/htdocs
 MEDIAGOBLIN_PORT=6543
 
-MEDIAGOBLIN_SHORT_DESCRIPTION=$'Mediagoblin'
-MEDIAGOBLIN_DESCRIPTION=$'Mediagoblin'
+MEDIAGOBLIN_SHORT_DESCRIPTION=$'Media storage and broadcast'
+MEDIAGOBLIN_DESCRIPTION=$'Media storage and broadcast'
 MEDIAGOBLIN_MOBILE_APP_URL=
 
 mediagoblin_variables=(ONION_ONLY

src/freedombone-app-movim

 MOVIM_ADMIN_PASSWORD=
 MOVIM_DAEMON_PORT=8880
 
-MOVIM_SHORT_DESCRIPTION=$'Movim'
-MOVIM_DESCRIPTION=$'Movim'
+MOVIM_SHORT_DESCRIPTION=$'xmpp based chat system'
+MOVIM_DESCRIPTION=$'xmpp based chat system'
 MOVIM_MOBILE_APP_URL='https://f-droid.org/packages/com.movim.movim'
 
 movim_variables=(ONION_ONLY

src/freedombone-app-mumble

 MUMBLE_DATABASE="mumble-server.sqlite"
 MUMBLE_CONFIG_FILE="mumble-server.ini"
 
-MUMBLE_SHORT_DESCRIPTION=$'Mumble'
-MUMBLE_DESCRIPTION=$'Mumble'
+MUMBLE_SHORT_DESCRIPTION=$'Voice chat'
+MUMBLE_DESCRIPTION=$'Voice chat'
 MUMBLE_MOBILE_APP_URL='https://f-droid.org/packages/com.morlunk.mumbleclient'
 
 mumble_variables=(MY_USERNAME

src/freedombone-app-nextcloud

 NEXTCLOUD_ADMIN_PASSWORD=
 NEXTCLOUD_SERVER_SIDE_ENCRYPTION=1
 
-NEXTCLOUD_SHORT_DESCRIPTION=$'NextCloud'
-NEXTCLOUD_DESCRIPTION=$'NextCloud'
+NEXTCLOUD_SHORT_DESCRIPTION=$'File storage and sync'
+NEXTCLOUD_DESCRIPTION=$'File storage and sync'
 NEXTCLOUD_MOBILE_APP_URL='https://f-droid.org/packages/com.nextcloud.client'
 
 nextcloud_variables=(ONION_ONLY

src/freedombone-app-peertube

 MESH_PEERTUBE_PORT=8500
 PEERTUBE_DIR=/etc/peertube
 
-PEERTUBE_SHORT_DESCRIPTION=$'PeerTube'
-PEERTUBE_DESCRIPTION=$'PeerTube'
+PEERTUBE_SHORT_DESCRIPTION=$'Video broadcast'
+PEERTUBE_DESCRIPTION=$'Video broadcast'
 PEERTUBE_MOBILE_APP_URL=
 
 peertube_variables=(PEERTUBE_DOMAIN_NAME

src/freedombone-app-pleroma

 pleroma_expire_posts_script=/usr/bin/pleroma-expire-posts
 blocking_script_file=/usr/bin/pleroma-blocking
 
-PLEROMA_SHORT_DESCRIPTION=$'Pleroma'
-PLEROMA_DESCRIPTION=$'Pleroma federated microblogging'
+PLEROMA_SHORT_DESCRIPTION=$'Federated microblogging'
+PLEROMA_DESCRIPTION=$'Federated microblogging'
 PLEROMA_MOBILE_APP_URL='https://f-droid.org/packages/com.keylesspalace.tusky'
 
 pleroma_variables=(ONION_ONLY

src/freedombone-app-postactiv

 # Number of months after which posts expire
 POSTACTIV_EXPIRE_MONTHS=3
 
-POSTACTIV_SHORT_DESCRIPTION=$'PostActiv'
-POSTACTIV_DESCRIPTION=$'PostActiv federated microblogging'
+POSTACTIV_SHORT_DESCRIPTION=$'Federated microblogging'
+POSTACTIV_DESCRIPTION=$'Federated microblogging'
 POSTACTIV_MOBILE_APP_URL='https://f-droid.org/packages/org.mariotaku.twidere/'
 
 postactiv_variables=(ONION_ONLY

src/freedombone-app-privatebin

 PRIVATEBIN_COMMIT='9c132cd839fd5e91da18e4a1e8ebef64fce605fb'
 PRIVATEBIN_ADMIN_PASSWORD=
 
-PRIVATEBIN_SHORT_DESCRIPTION=$'PrivateBin'
-PRIVATEBIN_DESCRIPTION=$'PrivateBin zero knowledge pastebin'
+PRIVATEBIN_SHORT_DESCRIPTION=$'Zero knowledge pastebin'
+PRIVATEBIN_DESCRIPTION=$'Zero knowledge pastebin'
 PRIVATEBIN_MOBILE_APP_URL=
 
 privatebin_variables=(ONION_ONLY

src/freedombone-app-rocketchat

 ROCKETCHAT_ONION_PORT=9722
 ROCKETCHAT_PORT_INTERNAL=3000
 
-ROCKETCHAT_SHORT_DESCRIPTION=$'Rocketchat'
-ROCKETCHAT_DESCRIPTION=$'Rocketchat'
+ROCKETCHAT_SHORT_DESCRIPTION=$'Chat system'
+ROCKETCHAT_DESCRIPTION=$'Chat system'
 ROCKETCHAT_MOBILE_APP_URL=
 
 rocketchat_variables=(ONION_ONLY

src/freedombone-app-syncthing

 SYNCTHING_SHARED_DATA=/var/lib/syncthing/SyncShared
 SYNCTHING_USER_IDS_FILE='.syncthingids'
 
-SYNCTHING_SHORT_DESCRIPTION=$'Syncthing'
-SYNCTHING_DESCRIPTION=$'Syncthing file synchronization'
+SYNCTHING_SHORT_DESCRIPTION=$'File synchronization'
+SYNCTHING_DESCRIPTION=$'File synchronization'
 SYNCTHING_MOBILE_APP_URL='https://f-droid.org/packages/com.nutomic.syncthingandroid'
 
 syncthing_variables=(SYNCTHING_ID

src/freedombone-app-turtl

 TURTL_SIGNUP_STRING='Signup a new user'
 turtl_users_file=$TURTL_BASE_DIR/api/controllers/users.lisp
 
-TURTL_SHORT_DESCRIPTION=$'Turtl'
-TURTL_DESCRIPTION=$'Turtl notes'
+TURTL_SHORT_DESCRIPTION=$'Note taking'
+TURTL_DESCRIPTION=$'Note taking'
 TURTL_MOBILE_APP_URL=
 
 turtl_variables=(ONION_ONLY

src/freedombone-app-xmpp

 prosody_modules_hash='982d0dfcef98e9cb9cee4cc3801b8ce9a503a32e44c32b99df6fe94545b90072'
 xmpp_encryption_warning=$"For security reasons, OMEMO or PGP encryption is required for conversations on this server."
 
-XMPP_SHORT_DESCRIPTION=$'XMPP chat'
-XMPP_DESCRIPTION=$'XMPP chat'
+XMPP_SHORT_DESCRIPTION=$'Chat system'
+XMPP_DESCRIPTION=$'Chat system'
 XMPP_MOBILE_APP_URL='https://f-droid.org/packages/eu.siacs.conversations'
 
 xmpp_variables=(ONION_ONLY

src/freedombone-image

             sudo pacman -S --noconfirm debootstrap xz dosfstools btrfs-progs syslinux python-pip
             sudo pacman -S --noconfirm qemu-static binfmt-qemu-static uboot-tools qemu parted
             sudo pacman -S --noconfirm dpkg-devtools bin86 arch-install-scripts qemu-arch-extra
-            sudo pacman -S --noconfirm syncthing
+            sudo pacman -S --noconfirm syncthing bin86 patch
             mkdir "$USERHOME/develop"
             if [ -d "$USERHOME/develop/python-cliapp" ]; then
                 sudo rm -rf "$USERHOME/develop/python-cliapp"
 chmod 600 "${CURR_DIR}/${PROJECT_NAME}_login_credentials.txt"
 
 if [[ $IMAGE_TYPE != "qemu"* ]]; then
-    IMAGE_FILENAME=$(find "${CURR_DIR}" -name "*.img" | head -n 1 | awk -F '/' '{print $2}')
+    IMAGE_FILENAME=$(find . -name "*.img" | head -n 1 | awk -F '/' '{print $2}')
 
     echo ''
     echo $'To compress:'

src/freedombone-utils-firewall

     iptables-save > /etc/firewall.conf
     ip6tables-save > /etc/firewall6.conf
     if [ ! -d /etc/network/if-up.d ]; then
-        mkdir /etc/network/if-up.d
+        mkdir -p /etc/network/if-up.d
     fi
     printf '#!/bin/sh\n' > /etc/network/if-up.d/iptables
     printf 'iptables-restore < /etc/firewall.conf\n' >> /etc/network/if-up.d/iptables