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

doc/EN/apps.org

 Store files on your server and sync them with laptops or mobile devices. Includes many plugins including videoconferencing and collaborative document editing.
 
 [[./app_nextcloud.html][How to use it]]
+* PeerTube
+Peer-to-peer video hosting. Similar to Mediagoblin, but the P2P aspect better enables the streaming load to be shared across servers.
+
+[[./app_peertube.html][How to use it]]
 * PI-Hole
 The black hole for web adverts. Block adverts at the domain name level within your local network. It can significantly reduce bandwidth, speed up page load times and protect your systems from being tracked by spyware.
 

doc/EN/armbian.org

 <center><h1>Installing on Armbian</h1></center>
 #+end_export
 
+#+begin_quote
+"/we are the music makers, we are the dreamers of dreams. cyberpunks and pirates. chaotic spectres hauting cyberspace. engineers, artists, hackers./"
+#+end_quote
+
 If you have a single board ARM computer which isn't one of the supported ones then you can probably still install Freedombone onto it if it has a [[https://www.armbian.com/download/][Debian Stretch Armbian image]] available for it.
 
 Download the Armbian image for your board. It must be version 9 (Stretch), otherwise it won't work. Extract the image from its archive, then copy it to a microSD card:

src/freedombone-app-peertube

+#!/bin/bash
+#
+# .---.                  .              .
+# |                      |              |
+# |--- .--. .-.  .-.  .-.|  .-. .--.--. |.-.  .-. .--.  .-.
+# |    |   (.-' (.-' (   | (   )|  |  | |   )(   )|  | (.-'
+# '    '     --'  --'  -' -  -' '  '   -' -'   -' '   -  --'
+#
+#                    Freedom in the Cloud
+#
+# PeerTube server
+#
+# License
+# =======
+#
+# Copyright (C) 2017 Bob Mottram <bob@freedombone.net>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# 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 media"
+
+IN_DEFAULT_INSTALL=0
+SHOW_ON_ABOUT=1
+
+PEERTUBE_DOMAIN_NAME=
+PEERTUBE_CODE=
+PEERTUBE_REPO="https://github.com/Chocobozzz/PeerTube"
+PEERTUBE_COMMIT='fef2c7164e025b12a64185dbab058ef4129733c6'
+PEERTUBE_ONION_PORT=8136
+PEERTUBE_PORT=9004
+PEERTUBE_DIR=/etc/peertube
+
+peertube_variables=(PEERTUBE_DOMAIN_NAME
+                    PEERTUBE_CODE
+                    PEERTUBE_ADMIN_PASSWORD
+                    ONION_ONLY
+                    DDNS_PROVIDER
+                    MY_USERNAME
+                    MY_EMAIL_ADDRESS)
+
+function peertube_create_database {
+    if [ -f $IMAGE_PASSWORD_FILE ]; then
+        PEERTUBE_ADMIN_PASSWORD="$(printf `cat $IMAGE_PASSWORD_FILE`)"
+    else
+        if [ ! $PEERTUBE_ADMIN_PASSWORD ]; then
+            PEERTUBE_ADMIN_PASSWORD="$(create_password ${MINIMUM_PASSWORD_LENGTH})"
+        fi
+    fi
+    if [ ! $PEERTUBE_ADMIN_PASSWORD ]; then
+        return
+    fi
+
+    systemctl restart postgresql
+    run_system_query_postgresql "CREATE USER peertube WITH PASSWORD '$PEERTUBE_ADMIN_PASSWORD';"
+    run_system_query_postgresql "CREATE DATABASE peertube OWNER peertube;"
+    run_system_query_postgresql "GRANT ALL PRIVILEGES ON DATABASE peertube to peertube;"
+    run_system_query_postgresql "set statement_timeout to 40000;"
+}
+
+function logging_on_peertube {
+    echo -n ''
+}
+
+function logging_off_peertube {
+    echo -n ''
+}
+
+function remove_user_peertube {
+    remove_username="$1"
+}
+
+function add_user_peertube {
+    if [[ $(app_is_installed peertube) == "0" ]]; then
+        echo '0'
+        return
+    fi
+
+    new_username="$1"
+    new_user_password="$2"
+
+    echo '0'
+}
+
+function install_interactive_peertube {
+    if [ ! $ONION_ONLY ]; then
+        ONION_ONLY='no'
+    fi
+
+    if [[ $ONION_ONLY != "no" ]]; then
+        PEERTUBE_DOMAIN_NAME='peertube.local'
+        write_config_param "PEERTUBE_DOMAIN_NAME" "$PEERTUBE_DOMAIN_NAME"
+    else
+        function_check interactive_site_details
+        interactive_site_details "peertube" "PEERTUBE_DOMAIN_NAME" "PEERTUBE_CODE"
+    fi
+    APP_INSTALLED=1
+}
+
+function peertube_set_admin_email {
+    read_config_param $MY_EMAIL_ADDRESS
+    data=$(tempfile 2>/dev/null)
+    trap "rm -f $data" 0 1 2 5 15
+    dialog --title $"Set PeerTube administrator email address" \
+           --backtitle $"Freedombone Control Panel" \
+           --inputbox $"Admin email address" 8 75 "$MY_EMAIL_ADDRESS" 2>$data
+    sel=$?
+    case $sel in
+        0)  peertube_email=$(<$data)
+            if [[ "$peertube_email" != *' '* && "$peertube_email" != *','* && "$peertube_email" != *';'* && "$peertube_email" == *'@'* && "$peertube_email" == *'.'* ]]; then
+                if [ ${#peertube_email} -gt 8 ]; then
+                    sed -i "s|email:.*|email: '${peertube_email}'|g" $PEERTUBE_DIR/config/production.yaml
+                    systemctl restart peertube
+                    dialog --title $"Set PeerTube administrator email address" \
+                           --msgbox $"Set to $peertube_email" 6 75
+                fi
+            fi
+            ;;
+    esac
+    rm $data
+}
+
+function peertube_disable_signups {
+    dialog --title $"Disable PeerTube signups" \
+           --backtitle $"Freedombone Control Panel" \
+           --yesno $"\nDo you wish to disable further PeerTube signups?" 8 75
+    sel=$?
+    case $sel in
+        0) sed "0,/RE/s/enabled:.*/enabled: false/" $PEERTUBE_DIR/config/production.yaml;;
+        1) sed "0,/RE/s/enabled:.*/enabled: true/" $PEERTUBE_DIR/config/production.yaml;;
+        255) return;;
+    esac
+
+    systemctl restart peertube
+}
+
+function configure_interactive_peertube {
+    while true
+    do
+        data=$(tempfile 2>/dev/null)
+        trap "rm -f $data" 0 1 2 5 15
+        dialog --backtitle $"Freedombone Control Panel" \
+               --title $"PeerTube" \
+               --radiolist $"Choose an operation:" 10 70 4 \
+               1 $"Set administrator email address" off \
+               2 $"Disable or enable signups" off \
+               3 $"Exit" on 2> $data
+        sel=$?
+        case $sel in
+            1) break;;
+            255) break;;
+        esac
+        case $(cat $data) in
+            1) peertube_set_admin_email;;
+            2) peertube_disable_signups;;
+            3) break;;
+        esac
+    done
+}
+
+function change_password_peertube {
+    PEERTUBE_USERNAME="$1"
+    PEERTUBE_PASSWORD="$2"
+    if [ ${#PEERTUBE_PASSWORD} -lt 8 ]; then
+        echo $'Peertube password is too short'
+        return
+    fi
+    #${PROJECT_NAME}-pass -u $PEERTUBE_USERNAME -a peertube -p "$PEERTUBE_PASSWORD"
+}
+
+function reconfigure_peertube {
+    echo -n ''
+}
+
+function upgrade_peertube {
+    CURR_PEERTUBE_COMMIT=$(get_completion_param "peertube commit")
+    if [[ "$CURR_PEERTUBE_COMMIT" == "$PEERTUBE_COMMIT" ]]; then
+        return
+    fi
+
+    read_config_param PEERTUBE_DOMAIN_NAME
+    systemctl stop peertube
+    cd $PEERTUBE_DIR
+
+    function_check set_repo_commit
+    set_repo_commit $PEERTUBE_DIR "peertube commit" "$PEERTUBE_COMMIT" $PEERTUBE_REPO
+
+    npm run upgrade-peertube
+    chown -R peertube:peertube $PEERTUBE_DIR
+    systemctl start peertube
+}
+
+function backup_local_peertube {
+    PEERTUBE_DOMAIN_NAME='peertube.local'
+    if grep -q "peertube domain" $COMPLETION_FILE; then
+        PEERTUBE_DOMAIN_NAME=$(get_completion_param "peertube domain")
+    fi
+
+    systemctl stop peertube
+    USE_POSTGRESQL=1
+    function_check backup_database_to_usb
+    backup_database_to_usb peertube
+    systemctl start peertube
+
+    peertube_path=$PEERTUBE_DIR/videos
+    if [ -d $peertube_path ]; then
+        suspend_site ${PEERTUBE_DOMAIN_NAME}
+        systemctl stop peertube
+        backup_directory_to_usb $peertube_path peertubevideos
+        systemctl start peertube
+        restart_site
+    fi
+}
+
+function restore_local_peertube {
+    PEERTUBE_DOMAIN_NAME='peertube.local'
+    if grep -q "peertube domain" $COMPLETION_FILE; then
+        PEERTUBE_DOMAIN_NAME=$(get_completion_param "peertube domain")
+    fi
+    if [ $PEERTUBE_DOMAIN_NAME ]; then
+        suspend_site ${PEERTUBE_DOMAIN_NAME}
+        systemctl stop peertube
+
+        USE_POSTGRESQL=1
+        restore_database peertube
+
+        temp_restore_dir=/root/temppeertubevideos
+        function_check restore_directory_from_usb
+        restore_directory_from_usb $temp_restore_dir peertubevideos
+        if [ -d $temp_restore_dir ]; then
+            if [ -d $temp_restore_dir$PEERTUBE_DIR/videos ]; then
+                cp -r $temp_restore_dir$PEERTUBE_DIR/videos/* $PEERTUBE_DIR/videos/
+            else
+                cp -r $temp_restore_dir/* $PEERTUBE_DIR/videos/
+            fi
+            chown -R peertube:peertube $PEERTUBE_DIR
+            rm -rf $temp_restore_dir
+        fi
+
+        systemctl start peertube
+        restart_site
+    fi
+}
+
+function backup_remote_peertube {
+    PEERTUBE_DOMAIN_NAME='peertube.local'
+    if grep -q "peertube domain" $COMPLETION_FILE; then
+        PEERTUBE_DOMAIN_NAME=$(get_completion_param "peertube domain")
+    fi
+
+    systemctl stop peertube
+    USE_POSTGRESQL=1
+    function_check backup_database_to_friend
+    backup_database_to_friend peertube
+    systemctl start peertube
+
+    temp_backup_dir=$PEERTUBE_DIR/videos
+    if [ -d $temp_backup_dir ]; then
+        systemctl stop peertube
+        suspend_site ${PEERTUBE_DOMAIN_NAME}
+        backup_directory_to_friend $temp_backup_dir peertubevideos
+        restart_site
+        systemctl start peertube
+    else
+        echo $"Peertube domain specified but not found in $temp_backup_dir"
+        exit 6383523
+    fi
+}
+
+function restore_remote_peertube {
+    PEERTUBE_DOMAIN_NAME='peertube.local'
+    if grep -q "peertube domain" $COMPLETION_FILE; then
+        PEERTUBE_DOMAIN_NAME=$(get_completion_param "peertube domain")
+    fi
+    suspend_site ${PEERTUBE_DOMAIN_NAME}
+
+    systemctl stop peertube
+
+    USE_POSTGRESQL=1
+    function_check restore_database_from_friend
+    restore_database_from_friend peertube
+
+    temp_restore_dir=/root/temppeertubevideos
+    function_check restore_directory_from_friend
+    restore_directory_from_friend $temp_restore_dir peertubevideos
+    if [ -d $temp_restore_dir ]; then
+        if [ -d $temp_restore_dir$PEERTUBE_DIR/videos ]; then
+            cp -r $temp_restore_dir$PEERTUBE_DIR/videos/* $PEERTUBE_DIR/videos/
+        else
+            cp -r $temp_restore_dir/* $PEERTUBE_DIR/videos/
+        fi
+        chown -R peertube: $PEERTUBE_DIR
+        rm -rf $temp_restore_dir
+    fi
+
+    systemctl start peertube
+    restart_site
+}
+
+function remove_peertube {
+    if [ ${#PEERTUBE_DOMAIN_NAME} -eq 0 ]; then
+        return
+    fi
+
+    systemctl stop peertube
+    systemctl disable peertube
+    rm /etc/systemd/system/peertube.service
+    systemctl daemon-reload
+
+    function_check remove_nodejs
+    remove_nodejs peertube
+
+    read_config_param "PEERTUBE_DOMAIN_NAME"
+    nginx_dissite $PEERTUBE_DOMAIN_NAME
+    remove_certs ${PEERTUBE_DOMAIN_NAME}
+    if [ -f /etc/nginx/sites-available/$PEERTUBE_DOMAIN_NAME ]; then
+        rm -f /etc/nginx/sites-available/$PEERTUBE_DOMAIN_NAME
+    fi
+    if [ -d /var/www/$PEERTUBE_DOMAIN_NAME ]; then
+        rm -rf /var/www/$PEERTUBE_DOMAIN_NAME
+    fi
+    remove_config_param PEERTUBE_DOMAIN_NAME
+    remove_config_param PEERTUBE_CODE
+    function_check remove_onion_service
+    remove_onion_service peertube ${PEERTUBE_ONION_PORT}
+    remove_completion_param "install_peertube"
+    sed -i '/peertube/d' $COMPLETION_FILE
+
+    function_check drop_database_postgresql
+    drop_database_postgresql peertube
+
+    remove_postgresql_user peertube
+    groupdel -f peertube
+    userdel -r peertube
+
+    if [ -d $PEERTUBE_DIR ]; then
+        rm -rf $PEERTUBE_DIR
+    fi
+
+    function_check remove_ddns_domain
+    remove_ddns_domain $PEERTUBE_DOMAIN_NAME
+}
+
+function peertube_setup_web {
+    peertube_nginx_file=/etc/nginx/sites-available/$PEERTUBE_DOMAIN_NAME
+
+    if [[ $ONION_ONLY == "no" ]]; then
+        echo 'server {' > $peertube_nginx_file
+        echo '  listen 80;' >> $peertube_nginx_file
+        echo '  listen [::]:80;' >> $peertube_nginx_file
+        echo "  server_name $PEERTUBE_DOMAIN_NAME;" >> $peertube_nginx_file
+        echo '  rewrite ^ https://$server_name$request_uri? permanent;' >> $peertube_nginx_file
+        echo '}' >> $peertube_nginx_file
+        echo '' >> $peertube_nginx_file
+        echo 'server {' >> $peertube_nginx_file
+        echo '  listen 443 ssl http2;' >> $peertube_nginx_file
+        echo '  listen [::]:443 ssl http2;' >> $peertube_nginx_file
+        echo "  server_name $PEERTUBE_DOMAIN_NAME;" >> $peertube_nginx_file
+        echo '' >> $peertube_nginx_file
+        function_check nginx_ssl
+        nginx_ssl $PEERTUBE_DOMAIN_NAME mobile
+
+        function_check nginx_disable_sniffing
+        nginx_disable_sniffing $PEERTUBE_DOMAIN_NAME
+
+        echo '  add_header Strict-Transport-Security max-age=15768000;' >> $peertube_nginx_file
+        echo '' >> $peertube_nginx_file
+        echo '  location / {' >> $peertube_nginx_file
+        echo "    proxy_pass http://localhost:${PEERTUBE_PORT};" >> $peertube_nginx_file
+        echo '    proxy_set_header X-Real-IP $remote_addr;' >> $peertube_nginx_file
+        echo '    proxy_set_header Host $host;' >> $peertube_nginx_file
+        echo '    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;' >> $peertube_nginx_file
+        echo '' >> $peertube_nginx_file
+        echo '    # For the video upload' >> $peertube_nginx_file
+        echo '    client_max_body_size 2G;' >> $peertube_nginx_file
+        echo '  }' >> $peertube_nginx_file
+        echo '' >> $peertube_nginx_file
+        echo '  location /static/webseed {' >> $peertube_nginx_file
+        echo "    if (\$request_method = 'OPTIONS') {" >> $peertube_nginx_file
+        echo "      add_header 'Access-Control-Allow-Origin' '*';" >> $peertube_nginx_file
+        echo "      add_header 'Access-Control-Allow-Methods' 'GET, OPTIONS';" >> $peertube_nginx_file
+        echo "      add_header 'Access-Control-Allow-Headers' 'Range,DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type';" >> $peertube_nginx_file
+        echo "      add_header 'Access-Control-Max-Age' 1728000;" >> $peertube_nginx_file
+        echo "      add_header 'Content-Type' 'text/plain charset=UTF-8';" >> $peertube_nginx_file
+        echo "      add_header 'Content-Length' 0;" >> $peertube_nginx_file
+        echo '      return 204;' >> $peertube_nginx_file
+        echo '    }' >> $peertube_nginx_file
+        echo '' >> $peertube_nginx_file
+        echo "    if (\$request_method = 'GET') {" >> $peertube_nginx_file
+        echo "      add_header 'Access-Control-Allow-Origin' '*';" >> $peertube_nginx_file
+        echo "      add_header 'Access-Control-Allow-Methods' 'GET, OPTIONS';" >> $peertube_nginx_file
+        echo "      add_header 'Access-Control-Allow-Headers' 'Range,DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type';" >> $peertube_nginx_file
+        echo '    }' >> $peertube_nginx_file
+        echo '' >> $peertube_nginx_file
+        echo "    alias $PEERTUBE_DIR/videos;" >> $peertube_nginx_file
+        echo '  }' >> $peertube_nginx_file
+        echo '' >> $peertube_nginx_file
+        echo '  # Websocket tracker' >> $peertube_nginx_file
+        echo '  location /tracker/socket {' >> $peertube_nginx_file
+        echo '    # Peers send a message to the tracker every 15 minutes' >> $peertube_nginx_file
+        echo '    # Dont close the websocket before this time' >> $peertube_nginx_file
+        echo '    proxy_read_timeout 1200s;' >> $peertube_nginx_file
+        echo '    proxy_set_header Upgrade $http_upgrade;' >> $peertube_nginx_file
+        echo '    proxy_set_header Connection "upgrade";' >> $peertube_nginx_file
+        echo '    proxy_http_version 1.1;' >> $peertube_nginx_file
+        echo '    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;' >> $peertube_nginx_file
+        echo '    proxy_set_header Host $host;' >> $peertube_nginx_file
+        echo "    proxy_pass http://localhost:${PEERTUBE_PORT};" >> $peertube_nginx_file
+        echo '  }' >> $peertube_nginx_file
+        echo '}' >> $peertube_nginx_file
+    else
+        echo -n '' > $peertube_nginx_file
+    fi
+    echo 'server {' >> $peertube_nginx_file
+    echo "  listen 127.0.0.1:$PEERTUBE_ONION_PORT default_server;" >> $peertube_nginx_file
+    echo "  server_name $PEERTUBE_ONION_HOSTNAME;" >> $peertube_nginx_file
+    echo '' >> $peertube_nginx_file
+    echo '  location / {' >> $peertube_nginx_file
+    echo "    proxy_pass http://localhost:${PEERTUBE_PORT};" >> $peertube_nginx_file
+    echo '    proxy_set_header X-Real-IP $remote_addr;' >> $peertube_nginx_file
+    echo '    proxy_set_header Host $host;' >> $peertube_nginx_file
+    echo '    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;' >> $peertube_nginx_file
+    echo '' >> $peertube_nginx_file
+    echo '    # For the video upload' >> $peertube_nginx_file
+    echo '    client_max_body_size 2G;' >> $peertube_nginx_file
+    echo '  }' >> $peertube_nginx_file
+    echo '' >> $peertube_nginx_file
+    echo '  location /static/webseed {' >> $peertube_nginx_file
+    echo "    if (\$request_method = 'OPTIONS') {" >> $peertube_nginx_file
+    echo "      add_header 'Access-Control-Allow-Origin' '*';" >> $peertube_nginx_file
+    echo "      add_header 'Access-Control-Allow-Methods' 'GET, OPTIONS';" >> $peertube_nginx_file
+    echo "      add_header 'Access-Control-Allow-Headers' 'Range,DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type';" >> $peertube_nginx_file
+    echo "      add_header 'Access-Control-Max-Age' 1728000;" >> $peertube_nginx_file
+    echo "      add_header 'Content-Type' 'text/plain charset=UTF-8';" >> $peertube_nginx_file
+    echo "      add_header 'Content-Length' 0;" >> $peertube_nginx_file
+    echo '      return 204;' >> $peertube_nginx_file
+    echo '    }' >> $peertube_nginx_file
+    echo '' >> $peertube_nginx_file
+    echo "    if (\$request_method = 'GET') {" >> $peertube_nginx_file
+    echo "      add_header 'Access-Control-Allow-Origin' '*';" >> $peertube_nginx_file
+    echo "      add_header 'Access-Control-Allow-Methods' 'GET, OPTIONS';" >> $peertube_nginx_file
+    echo "      add_header 'Access-Control-Allow-Headers' 'Range,DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type';" >> $peertube_nginx_file
+    echo '    }' >> $peertube_nginx_file
+    echo '' >> $peertube_nginx_file
+    echo "    alias $PEERTUBE_DIR/videos;" >> $peertube_nginx_file
+    echo '  }' >> $peertube_nginx_file
+    echo '' >> $peertube_nginx_file
+    echo '  # Websocket tracker' >> $peertube_nginx_file
+    echo '  location /tracker/socket {' >> $peertube_nginx_file
+    echo '    # Peers send a message to the tracker every 15 minutes' >> $peertube_nginx_file
+    echo '    # Dont close the websocket before this time' >> $peertube_nginx_file
+    echo '    proxy_read_timeout 1200s;' >> $peertube_nginx_file
+    echo '    proxy_set_header Upgrade $http_upgrade;' >> $peertube_nginx_file
+    echo '    proxy_set_header Connection "upgrade";' >> $peertube_nginx_file
+    echo '    proxy_http_version 1.1;' >> $peertube_nginx_file
+    echo '    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;' >> $peertube_nginx_file
+    echo '    proxy_set_header Host $host;' >> $peertube_nginx_file
+    echo "    proxy_pass http://localhost:${PEERTUBE_PORT};" >> $peertube_nginx_file
+    echo '  }' >> $peertube_nginx_file
+    echo '}' >> $peertube_nginx_file
+
+    # CSP currently causes an error
+    sed -i '/Content-Security-Policy/d' $peertube_nginx_file
+
+    function_check create_site_certificate
+    create_site_certificate $PEERTUBE_DOMAIN_NAME 'yes'
+
+    function_check nginx_ensite
+    nginx_ensite $PEERTUBE_DOMAIN_NAME
+}
+
+function peertube_create_config {
+    peertube_config_file=$PEERTUBE_DIR/config/production.yaml
+    echo 'listen:' > $peertube_config_file
+    echo "  port: $PEERTUBE_PORT" >> $peertube_config_file
+    echo '' >> $peertube_config_file
+    echo '# Correspond to your reverse proxy "listen" configuration' >> $peertube_config_file
+    echo 'webserver:' >> $peertube_config_file
+    if [[ $ONION_ONLY == 'no' ]]; then
+        echo '  https: true' >> $peertube_config_file
+        echo "  hostname: '$PEERTUBE_DOMAIN_NAME'" >> $peertube_config_file
+        echo '  port: 443' >> $peertube_config_file
+    else
+        echo '  https: false' >> $peertube_config_file
+        echo "  hostname: '$PEERTUBE_ONION_HOSTNAME'" >> $peertube_config_file
+        echo '  port: 80' >> $peertube_config_file
+    fi
+    echo '' >> $peertube_config_file
+    echo '# Your database name will be "peertube"+database.suffix' >> $peertube_config_file
+    echo 'database:' >> $peertube_config_file
+    echo "  hostname: 'localhost'" >> $peertube_config_file
+    echo '  port: 5432' >> $peertube_config_file
+    echo "  suffix: ''" >> $peertube_config_file
+    echo "  username: 'peertube'" >> $peertube_config_file
+    echo "  password: '$PEERTUBE_ADMIN_PASSWORD'" >> $peertube_config_file
+    echo '' >> $peertube_config_file
+    echo '# From the project root directory' >> $peertube_config_file
+    echo 'storage:' >> $peertube_config_file
+    echo "  certs: 'certs/'" >> $peertube_config_file
+    echo "  videos: 'videos/'" >> $peertube_config_file
+    echo "  logs: 'logs/'" >> $peertube_config_file
+    echo "  previews: 'previews/'" >> $peertube_config_file
+    echo "  thumbnails: 'thumbnails/'" >> $peertube_config_file
+    echo "  torrents: 'torrents/'" >> $peertube_config_file
+    echo "  cache: 'cache/'" >> $peertube_config_file
+    echo '' >> $peertube_config_file
+    echo 'cache:' >> $peertube_config_file
+    echo '  previews:' >> $peertube_config_file
+    echo '    size: 10 # Max number of previews you want to cache' >> $peertube_config_file
+    echo '' >> $peertube_config_file
+    echo 'admin:' >> $peertube_config_file
+    echo "  email: '$MY_EMAIL_ADDRESS'" >> $peertube_config_file
+    echo '' >> $peertube_config_file
+    echo 'signup:' >> $peertube_config_file
+    echo '  enabled: true' >> $peertube_config_file
+    echo '  limit: 2 # When the limit is reached, registrations are disabled. -1 == unlimited' >> $peertube_config_file
+    echo '' >> $peertube_config_file
+    echo 'user:' >> $peertube_config_file
+    echo '  # Default value of maximum video BYTES the user can upload (does not take into account transcoded files).' >> $peertube_config_file
+    echo '  # -1 == unlimited' >> $peertube_config_file
+    echo '  video_quota: -1' >> $peertube_config_file
+    echo '' >> $peertube_config_file
+    echo '# If enabled, the video will be transcoded to mp4 (x264) with "faststart" flag' >> $peertube_config_file
+    echo '# Uses a lot of CPU!' >> $peertube_config_file
+    echo 'transcoding:' >> $peertube_config_file
+    echo '  enabled: true' >> $peertube_config_file
+    echo '  threads: 2' >> $peertube_config_file
+    echo '  resolutions: # Only created if the original video has a higher resolution' >> $peertube_config_file
+    echo '    240p: true' >> $peertube_config_file
+    echo '    360p: false' >> $peertube_config_file
+    echo '    480p: false' >> $peertube_config_file
+    echo '    720p: false' >> $peertube_config_file
+    echo '    1080p: false' >> $peertube_config_file
+}
+
+function install_peertube {
+    if [ ! $ONION_ONLY ]; then
+        ONION_ONLY='no'
+    fi
+
+    if [ ! $PEERTUBE_DOMAIN_NAME ]; then
+        echo $'The peertube domain name was not specified'
+        exit 783523
+    fi
+
+    apt-get -yq install ffmpeg
+
+    function_check install_postgresql
+    install_postgresql
+
+    if [ ! -d /var/www/$PEERTUBE_DOMAIN_NAME/htdocs ]; then
+        mkdir -p /var/www/$PEERTUBE_DOMAIN_NAME/htdocs
+    fi
+
+    if [ -d $PEERTUBE_DIR ]; then
+        rm -rf $PEERTUBE_DIR
+    fi
+
+    groupadd peertube
+    useradd -c "PeerTube system account" -d $PEERTUBE_DIR -m -r -g peertube peertube
+
+    peertube_create_database
+
+    function_check install_nodejs
+    install_nodejs peertube
+
+    if [ -d /repos/peertube ]; then
+        mkdir -p $PEERTUBE_DIR
+        cp -r -p /repos/peertube/. $PEERTUBE_DIR
+        cd $PEERTUBE_DIR
+        git pull
+    else
+        function_check git_clone
+        git_clone $PEERTUBE_REPO $PEERTUBE_DIR
+    fi
+
+    cd $PEERTUBE_DIR
+    git checkout $PEERTUBE_COMMIT -b $PEERTUBE_COMMIT
+    set_completion_param "peertube commit" "$PEERTUBE_COMMIT"
+
+    npm install -g yarn
+    if [ ! "$?" = "0" ]; then
+        echo $'Failed to install yarn'
+        exit 79353234
+    fi
+    yarn add -D webpack --network-concurrency 1
+    yarn install
+    if [ ! "$?" = "0" ]; then
+        echo $'Failed to run yarn install'
+        exit 63754235
+    fi
+    npm install
+    if [ ! "$?" = "0" ]; then
+        echo $'Failed to install peertube'
+        exit 7835243
+    fi
+    npm run build
+    if [ ! "$?" = "0" ]; then
+        echo $'Failed to build peertube'
+        exit 5293593
+    fi
+
+    PEERTUBE_ONION_HOSTNAME=$(add_onion_service peertube 80 ${PEERTUBE_ONION_PORT})
+
+    echo '[Unit]' > /etc/systemd/system/peertube.service
+    echo 'Description=PeerTube Decentralized video streaming platform' >> /etc/systemd/system/peertube.service
+    echo 'After=syslog.target' >> /etc/systemd/system/peertube.service
+    echo 'After=network.target' >> /etc/systemd/system/peertube.service
+    echo '' >> /etc/systemd/system/peertube.service
+    echo '[Service]' >> /etc/systemd/system/peertube.service
+    echo 'User=peertube' >> /etc/systemd/system/peertube.service
+    echo 'Group=peertube' >> /etc/systemd/system/peertube.service
+    echo "WorkingDirectory=$PEERTUBE_DIR" >> /etc/systemd/system/peertube.service
+    echo "ExecStart=/usr/local/bin/npm start" >> /etc/systemd/system/peertube.service
+    echo "ExecStop=/usr/local/bin/npm stop" >> /etc/systemd/system/peertube.service
+    echo 'StandardOutput=syslog' >> /etc/systemd/system/peertube.service
+    echo 'StandardError=syslog' >> /etc/systemd/system/peertube.service
+    echo 'SyslogIdentifier=peertube' >> /etc/systemd/system/peertube.service
+    echo 'Restart=always' >> /etc/systemd/system/peertube.service
+    echo "Environment=NODE_ENV=production" >> /etc/systemd/system/peertube.service
+    echo '' >> /etc/systemd/system/peertube.service
+    echo '[Install]' >> /etc/systemd/system/peertube.service
+    echo 'WantedBy=multi-user.target' >> /etc/systemd/system/peertube.service
+
+    peertube_create_config
+
+    chown -R peertube:peertube $PEERTUBE_DIR
+
+    peertube_setup_web
+
+    ${PROJECT_NAME}-pass -u $MY_USERNAME -a peertube -p "$PEERTUBE_ADMIN_PASSWORD"
+
+    function_check add_ddns_domain
+    add_ddns_domain $PEERTUBE_DOMAIN_NAME
+
+    systemctl enable peertube
+    systemctl daemon-reload
+    systemctl start peertube
+    systemctl restart nginx
+
+    set_completion_param "peertube domain" "$PEERTUBE_DOMAIN_NAME"
+    APP_INSTALLED=1
+}
+
+# NOTE: deliberately no exit 0

src/freedombone-app-smilodon

 SHOW_ICANN_ADDRESS_ON_ABOUT=0
 
 SMILODON_REPO="https://github.com/bashrc/smilodon"
-SMILODON_COMMIT='e17dad10f9d4c00516b9c93a587e4298b3639af3'
+SMILODON_COMMIT='18c91b84737fbb1a106d3c495730ac3261aac335'
 SMILODON_ADMIN_PASSWORD=
 SMILODON_ONION_PORT=8054
 SMILODON_PATH=/etc/smilodon
     git checkout $SMILODON_COMMIT -b $SMILODON_COMMIT
     set_completion_param "smilodon commit" "$SMILODON_COMMIT"
 
+    sed -i 's|https:|http:|g' $SMILODON_PATH/api/utilities.py
+
     groupadd smilodon
     useradd -c "Smilodon system account" -d $SMILODON_PATH -m -r -g smilodon smilodon
 
     echo "export smilodon_admin_address=$MY_EMAIL_ADDRESS" >> ${SMILODON_PATH}/run_smilodon.sh
     echo "export MAIL_SERVER='localhost'" >> ${SMILODON_PATH}/run_smilodon.sh
     echo "export MAIL_PORT=25" >> ${SMILODON_PATH}/run_smilodon.sh
+    echo "export API_NAME=$SMILODON_ONION_HOSTNAME" >> ${SMILODON_PATH}/run_smilodon.sh
     echo "python3 run.py" >> ${SMILODON_PATH}/run_smilodon.sh
     chmod +x ${SMILODON_PATH}/run_smilodon.sh
     chown smilodon:smilodon ${SMILODON_PATH}/run_smilodon.sh

src/freedombone-image-customise

     git clone $TURTL_REPO $rootdir/repos/turtl
     git clone $KANBOARD_REPO $rootdir/repos/kanboard
     git clone $KEYSERVER_WEB_REPO $rootdir/repos/keyserverweb
+    git clone $PEERTUBE_REPO $rootdir/repos/peertube
     #git clone $WEKAN_REPO $rootdir/repos/wekan
     #git clone $FLOW_ROUTER_REPO $rootdir/repos/flowrouter
     #git clone $METEOR_USERACCOUNTS_REPO $rootdir/repos/meteoruseraccounts

src/freedombone-utils-postgresql

 function add_postgresql_user {
     postgresql_username=$1
     postgresql_password=$2
+    cd /etc/postgresql
     if [[ "$3" != 'encrypt'* ]]; then
         sudo -u postgres psql -c "create user $postgresql_username password '$postgresql_password';"
     else
 
 function remove_postgresql_user {
     postgresql_username=$1
+    cd /etc/postgresql
     sudo -u postgres psql -c "drop user $postgresql_username"
 }
 
 function drop_database_postgresql {
     database_name="$1"
+    cd /etc/postgresql
     sudo -u postgres psql -c "drop database $database_name"
 }
 
 function run_system_query_postgresql {
     query=$1
+    cd /etc/postgresql
     sudo -u postgres psql -c "$query"
 }
 
 function run_query_postgresql {
     database_name=$1
     database_query=$2
+    cd /etc/postgresql
     sudo -u postgres psql -d $database_name -c "$database_query"
 }
 
 function run_query_postgresql_with_output {
     database_name=$1
     database_query=$2
+    cd /etc/postgresql
     output=$(sudo -u postgres psql -d $database_name -c << EOF
 $database_query
 EOF
 function initialise_database_postgresql {
     database_name=$1
     database_file=$2
+    cd /etc/postgresql
     sudo -u postgres psql $database_name < $database_file
     if [ ! "$?" = "0" ]; then
         exit 7238525
 flush privileges;
 quit" > $INSTALL_DIR/batch.sql
     chmod 600 $INSTALL_DIR/batch.sql
+    cd /etc/postgresql
     sudo -u postgres psql -d $database_name --file=$INSTALL_DIR/batch.sql
     shred -zu $INSTALL_DIR/batch.sql
 }

website/EN/app_peertube.html

+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
+<head>
+<!-- 2017-12-01 Fri 10:41 -->
+<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
+<meta name="viewport" content="width=device-width, initial-scale=1" />
+<title>&lrm;</title>
+<meta name="generator" content="Org mode" />
+<meta name="author" content="Bob Mottram" />
+<meta name="description" content="How to use PeerTube"
+ />
+<meta name="keywords" content="freedombone, peertube" />
+<style type="text/css">
+ <!--/*--><![CDATA[/*><!--*/
+  .title  { text-align: center;
+             margin-bottom: .2em; }
+  .subtitle { text-align: center;
+              font-size: medium;
+              font-weight: bold;
+              margin-top:0; }
+  .todo   { font-family: monospace; color: red; }
+  .done   { font-family: monospace; color: green; }
+  .priority { font-family: monospace; color: orange; }
+  .tag    { background-color: #eee; font-family: monospace;
+            padding: 2px; font-size: 80%; font-weight: normal; }
+  .timestamp { color: #bebebe; }
+  .timestamp-kwd { color: #5f9ea0; }
+  .org-right  { margin-left: auto; margin-right: 0px;  text-align: right; }
+  .org-left   { margin-left: 0px;  margin-right: auto; text-align: left; }
+  .org-center { margin-left: auto; margin-right: auto; text-align: center; }
+  .underline { text-decoration: underline; }
+  #postamble p, #preamble p { font-size: 90%; margin: .2em; }
+  p.verse { margin-left: 3%; }
+  pre {
+    border: 1px solid #ccc;
+    box-shadow: 3px 3px 3px #eee;
+    padding: 8pt;
+    font-family: monospace;
+    overflow: auto;
+    margin: 1.2em;
+  }
+  pre.src {
+    position: relative;
+    overflow: visible;
+    padding-top: 1.2em;
+  }
+  pre.src:before {
+    display: none;
+    position: absolute;
+    background-color: white;
+    top: -10px;
+    right: 10px;
+    padding: 3px;
+    border: 1px solid black;
+  }
+  pre.src:hover:before { display: inline;}
+  /* Languages per Org manual */
+  pre.src-asymptote:before { content: 'Asymptote'; }
+  pre.src-awk:before { content: 'Awk'; }
+  pre.src-C:before { content: 'C'; }
+  /* pre.src-C++ doesn't work in CSS */
+  pre.src-clojure:before { content: 'Clojure'; }
+  pre.src-css:before { content: 'CSS'; }
+  pre.src-D:before { content: 'D'; }
+  pre.src-ditaa:before { content: 'ditaa'; }
+  pre.src-dot:before { content: 'Graphviz'; }
+  pre.src-calc:before { content: 'Emacs Calc'; }
+  pre.src-emacs-lisp:before { content: 'Emacs Lisp'; }
+  pre.src-fortran:before { content: 'Fortran'; }
+  pre.src-gnuplot:before { content: 'gnuplot'; }
+  pre.src-haskell:before { content: 'Haskell'; }
+  pre.src-hledger:before { content: 'hledger'; }
+  pre.src-java:before { content: 'Java'; }
+  pre.src-js:before { content: 'Javascript'; }
+  pre.src-latex:before { content: 'LaTeX'; }
+  pre.src-ledger:before { content: 'Ledger'; }
+  pre.src-lisp:before { content: 'Lisp'; }
+  pre.src-lilypond:before { content: 'Lilypond'; }
+  pre.src-lua:before { content: 'Lua'; }
+  pre.src-matlab:before { content: 'MATLAB'; }
+  pre.src-mscgen:before { content: 'Mscgen'; }
+  pre.src-ocaml:before { content: 'Objective Caml'; }
+  pre.src-octave:before { content: 'Octave'; }
+  pre.src-org:before { content: 'Org mode'; }
+  pre.src-oz:before { content: 'OZ'; }
+  pre.src-plantuml:before { content: 'Plantuml'; }
+  pre.src-processing:before { content: 'Processing.js'; }
+  pre.src-python:before { content: 'Python'; }
+  pre.src-R:before { content: 'R'; }
+  pre.src-ruby:before { content: 'Ruby'; }
+  pre.src-sass:before { content: 'Sass'; }
+  pre.src-scheme:before { content: 'Scheme'; }
+  pre.src-screen:before { content: 'Gnu Screen'; }
+  pre.src-sed:before { content: 'Sed'; }
+  pre.src-sh:before { content: 'shell'; }
+  pre.src-sql:before { content: 'SQL'; }
+  pre.src-sqlite:before { content: 'SQLite'; }
+  /* additional languages in org.el's org-babel-load-languages alist */
+  pre.src-forth:before { content: 'Forth'; }
+  pre.src-io:before { content: 'IO'; }
+  pre.src-J:before { content: 'J'; }
+  pre.src-makefile:before { content: 'Makefile'; }
+  pre.src-maxima:before { content: 'Maxima'; }
+  pre.src-perl:before { content: 'Perl'; }
+  pre.src-picolisp:before { content: 'Pico Lisp'; }
+  pre.src-scala:before { content: 'Scala'; }
+  pre.src-shell:before { content: 'Shell Script'; }
+  pre.src-ebnf2ps:before { content: 'ebfn2ps'; }
+  /* additional language identifiers per "defun org-babel-execute"
+       in ob-*.el */
+  pre.src-cpp:before  { content: 'C++'; }
+  pre.src-abc:before  { content: 'ABC'; }
+  pre.src-coq:before  { content: 'Coq'; }
+  pre.src-groovy:before  { content: 'Groovy'; }
+  /* additional language identifiers from org-babel-shell-names in
+     ob-shell.el: ob-shell is the only babel language using a lambda to put
+     the execution function name together. */
+  pre.src-bash:before  { content: 'bash'; }
+  pre.src-csh:before  { content: 'csh'; }
+  pre.src-ash:before  { content: 'ash'; }
+  pre.src-dash:before  { content: 'dash'; }
+  pre.src-ksh:before  { content: 'ksh'; }
+  pre.src-mksh:before  { content: 'mksh'; }
+  pre.src-posh:before  { content: 'posh'; }
+  /* Additional Emacs modes also supported by the LaTeX listings package */
+  pre.src-ada:before { content: 'Ada'; }
+  pre.src-asm:before { content: 'Assembler'; }
+  pre.src-caml:before { content: 'Caml'; }
+  pre.src-delphi:before { content: 'Delphi'; }
+  pre.src-html:before { content: 'HTML'; }
+  pre.src-idl:before { content: 'IDL'; }
+  pre.src-mercury:before { content: 'Mercury'; }
+  pre.src-metapost:before { content: 'MetaPost'; }
+  pre.src-modula-2:before { content: 'Modula-2'; }
+  pre.src-pascal:before { content: 'Pascal'; }
+  pre.src-ps:before { content: 'PostScript'; }
+  pre.src-prolog:before { content: 'Prolog'; }
+  pre.src-simula:before { content: 'Simula'; }
+  pre.src-tcl:before { content: 'tcl'; }
+  pre.src-tex:before { content: 'TeX'; }
+  pre.src-plain-tex:before { content: 'Plain TeX'; }
+  pre.src-verilog:before { content: 'Verilog'; }
+  pre.src-vhdl:before { content: 'VHDL'; }
+  pre.src-xml:before { content: 'XML'; }
+  pre.src-nxml:before { content: 'XML'; }
+  /* add a generic configuration mode; LaTeX export needs an additional
+     (add-to-list 'org-latex-listings-langs '(conf " ")) in .emacs */
+  pre.src-conf:before { content: 'Configuration File'; }
+
+  table { border-collapse:collapse; }
+  caption.t-above { caption-side: top; }
+  caption.t-bottom { caption-side: bottom; }
+  td, th { vertical-align:top;  }
+  th.org-right  { text-align: center;  }
+  th.org-left   { text-align: center;   }
+  th.org-center { text-align: center; }
+  td.org-right  { text-align: right;  }
+  td.org-left   { text-align: left;   }
+  td.org-center { text-align: center; }
+  dt { font-weight: bold; }
+  .footpara { display: inline; }
+  .footdef  { margin-bottom: 1em; }
+  .figure { padding: 1em; }
+  .figure p { text-align: center; }
+  .inlinetask {
+    padding: 10px;
+    border: 2px solid gray;
+    margin: 10px;
+    background: #ffffcc;
+  }
+  #org-div-home-and-up
+   { text-align: right; font-size: 70%; white-space: nowrap; }
+  textarea { overflow-x: auto; }
+  .linenr { font-size: smaller }
+  .code-highlighted { background-color: #ffff00; }
+  .org-info-js_info-navigation { border-style: none; }
+  #org-info-js_console-label
+    { font-size: 10px; font-weight: bold; white-space: nowrap; }
+  .org-info-js_search-highlight
+    { background-color: #ffff00; color: #000000; font-weight: bold; }
+  .org-svg { width: 90%; }
+  /*]]>*/-->
+</style>
+<link rel="stylesheet" type="text/css" href="freedombone.css" />
+<script type="text/javascript">
+/*
+@licstart  The following is the entire license notice for the
+JavaScript code in this tag.
+
+Copyright (C) 2012-2017 Free Software Foundation, Inc.
+
+The JavaScript code in this tag is free software: you can
+redistribute it and/or modify it under the terms of the GNU
+General Public License (GNU GPL) as published by the Free Software
+Foundation, either version 3 of the License, or (at your option)
+any later version.  The code is distributed WITHOUT ANY WARRANTY;
+without even the implied warranty of MERCHANTABILITY or FITNESS
+FOR A PARTICULAR PURPOSE.  See the GNU GPL for more details.
+
+As additional permission under GNU GPL version 3 section 7, you
+may distribute non-source (e.g., minimized or compacted) forms of
+that code without the copy of the GNU GPL normally required by
+section 4, provided you include this license notice and a URL
+through which recipients can access the Corresponding Source.
+
+
+@licend  The above is the entire license notice
+for the JavaScript code in this tag.
+*/
+<!--/*--><![CDATA[/*><!--*/
+ function CodeHighlightOn(elem, id)
+ {
+   var target = document.getElementById(id);
+   if(null != target) {
+     elem.cacheClassElem = elem.className;
+     elem.cacheClassTarget = target.className;
+     target.className = "code-highlighted";
+     elem.className   = "code-highlighted";
+   }
+ }
+ function CodeHighlightOff(elem, id)
+ {
+   var target = document.getElementById(id);
+   if(elem.cacheClassElem)
+     elem.className = elem.cacheClassElem;
+   if(elem.cacheClassTarget)
+     target.className = elem.cacheClassTarget;
+ }
+/*]]>*///-->
+</script>
+</head>
+<body>
+<div id="preamble" class="status">
+<a name="top" id="top"></a>
+</div>
+<div id="content">
+<div class="org-center">
+
+<div class="figure">
+<p><img src="images/logo.png" alt="logo.png" />
+</p>
+</div>
+</div>
+
+<center>
+<h1>PeerTube</h1>
+</center>
+
+<p>
+This is a video hosting system similar to Mediagoblin but using <a href="https://webtorrent.io/">webtorrent</a> to help distribute the files to or between clients. This should be more practical for situations where a video becomes popular because the load is then spread across the network, with performance increasing with the number of nodes.
+</p>
+
+<div class="org-center">
+
+<div class="figure">
+<p><img src="images/peertube.jpg" alt="peertube.jpg" />
+</p>
+</div>
+</div>
+
+<div id="outline-container-org89b3d26" class="outline-2">
+<h2 id="org89b3d26">Installation</h2>
+<div class="outline-text-2" id="text-org89b3d26">
+<p>
+Log into your system with:
+</p>
+
+<div class="org-src-container">
+<pre class="src src-bash">ssh myusername@mydomain -p 2222
+</pre>
+</div>
+
+<p>
+Using cursor keys, space bar and Enter key select <b>Administrator controls</b> and type in your password.
+</p>
+
+<p>
+Select <b>Add/Remove Apps</b> then <b>peertube</b>. You will then be asked for a domain name and if you are using FreeDNS also the code for the domain which can be found under <b>Dynamic DNS</b> on the FreeDNS site (the random string from "<i>quick cron example</i>" which appears after <i>update.php?</i> and before <i>&gt;&gt;</i>). For more details on obtaining a domain and making it accessible via dynamic DNS see the <a href="./faq.html">FAQ</a>. Typically the domain name you use will be a subdomain, such as <i>video.mydomainname.net</i>. It will need to be a domain which you have bought somewhere and own and not one of the FreeDNS subdomains, otherwise you won't be able to get a SSL/TLS certificate for it.
+</p>
+</div>
+</div>
+
+<div id="outline-container-orgc6d8e67" class="outline-2">
+<h2 id="orgc6d8e67">Initial setup</h2>
+<div class="outline-text-2" id="text-orgc6d8e67">
+<p>
+Navigate to your site and select <b>Signup</b> to create a new account. By default the maximum number of accounts on your system is limited to a small number so that millions of random internet users can't then begin uploading dubious content. After that it's pretty straightforward.
+</p>
+
+<p>
+One thing to be aware of is that after you upload a video it will take quite a while to transcode, and during that time you won't be able to play it or it will hang after playing. A way to avoid this wait is to ensure that your videos are already in mp4 format when you upload them.
+</p>
+</div>
+</div>
+</div>
+<div id="postamble" class="status">
+
+<style type="text/css">
+.back-to-top {
+    position: fixed;
+    bottom: 2em;
+    right: 0px;
+    text-decoration: none;
+    color: #000000;
+    background-color: rgba(235, 235, 235, 0.80);
+    font-size: 12px;
+    padding: 1em;
+    display: none;
+}
+
+.back-to-top:hover {
+    background-color: rgba(135, 135, 135, 0.50);
+}
+</style>
+
+<div class="back-to-top">
+<a href="#top">Back to top</a> | <a href="mailto:bob@freedombone.net">E-mail me</a>
+</div>
+</div>
+</body>
+</html>

website/EN/apps.html

 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
 <head>
-<!-- 2017-11-27 Mon 12:30 -->
+<!-- 2017-12-01 Fri 10:19 -->
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <title>&lrm;</title>
 </div>
 </div>
 
-<div id="outline-container-org6976750" class="outline-2">
-<h2 id="org6976750">CryptPad</h2>
-<div class="outline-text-2" id="text-org6976750">
+<div id="outline-container-orgf8331ba" class="outline-2">
+<h2 id="orgf8331ba">CryptPad</h2>
+<div class="outline-text-2" id="text-orgf8331ba">
 <p>
 Collaborate on editing documents, presentations and source code, or vote on things. All with a good level of security.
 </p>
 </p>
 </div>
 </div>
-<div id="outline-container-org034a81a" class="outline-2">
-<h2 id="org034a81a">DLNA</h2>
-<div class="outline-text-2" id="text-org034a81a">
+<div id="outline-container-orgca21c4d" class="outline-2">
+<h2 id="orgca21c4d">DLNA</h2>
+<div class="outline-text-2" id="text-orgca21c4d">
 <p>
 Enables you to use the system as a music server which any DLNA compatible devices can connect to within your home network.
 </p>
 </p>
 </div>
 </div>
-<div id="outline-container-orgd4981e7" class="outline-2">
-<h2 id="orgd4981e7">Dokuwiki</h2>
-<div class="outline-text-2" id="text-orgd4981e7">
+<div id="outline-container-org6f48ecb" class="outline-2">
+<h2 id="org6f48ecb">Dokuwiki</h2>
+<div class="outline-text-2" id="text-org6f48ecb">
 <p>
 A databaseless wiki system.
 </p>
 </p>
 </div>
 </div>
-<div id="outline-container-org5c87cff" class="outline-2">
-<h2 id="org5c87cff">Emacs</h2>
-<div class="outline-text-2" id="text-org5c87cff">
+<div id="outline-container-org312cd59" class="outline-2">
+<h2 id="org312cd59">Emacs</h2>
+<div class="outline-text-2" id="text-org312cd59">
 <p>
 If you use the Mutt client to read your email then this will set it up to use emacs for composing new mail.
 </p>
 </p>
 </div>
 </div>
-<div id="outline-container-org8f6c5e6" class="outline-2">
-<h2 id="org8f6c5e6">Etherpad</h2>
-<div class="outline-text-2" id="text-org8f6c5e6">
+<div id="outline-container-org631741c" class="outline-2">
+<h2 id="org631741c">Etherpad</h2>
+<div class="outline-text-2" id="text-org631741c">
 <p>
 Collaborate on creating documents in real time. Maybe you're planning a holiday with other family members or creating documentation for a Free Software project along with other volunteers. Etherpad is hard to beat for simplicity and speed. Only users of the system will be able to access it.
 </p>
 </p>
 </div>
 </div>
-<div id="outline-container-orgbda9945" class="outline-2">
-<h2 id="orgbda9945">Friendica</h2>
-<div class="outline-text-2" id="text-orgbda9945">
+<div id="outline-container-orgdeda776" class="outline-2">
+<h2 id="orgdeda776">Friendica</h2>
+<div class="outline-text-2" id="text-orgdeda776">
 <p>
 Federated social network system.
 </p>
 </p>
 </div>
 </div>
-<div id="outline-container-orgfe1de94" class="outline-2">
-<h2 id="orgfe1de94">Ghost</h2>
-<div class="outline-text-2" id="text-orgfe1de94">
+<div id="outline-container-orgbedc668" class="outline-2">
+<h2 id="orgbedc668">Ghost</h2>
+<div class="outline-text-2" id="text-orgbedc668">
 <p>
 Modern looking blogging system.
 </p>
 </p>
 </div>
 </div>
-<div id="outline-container-orgdd6af7e" class="outline-2">
-<h2 id="orgdd6af7e">GNU Social</h2>
-<div class="outline-text-2" id="text-orgdd6af7e">
+<div id="outline-container-org43b36ad" class="outline-2">
+<h2 id="org43b36ad">GNU Social</h2>
+<div class="outline-text-2" id="text-org43b36ad">
 <p>
 Federated social network based on the OStatus protocol. You can "<i>remote follow</i>" other users within the GNU Social federation.
 </p>
 </p>
 </div>
 </div>
-<div id="outline-container-org8f2e173" class="outline-2">
-<h2 id="org8f2e173">Gogs</h2>
-<div class="outline-text-2" id="text-org8f2e173">
+<div id="outline-container-orgd452cf4" class="outline-2">
+<h2 id="orgd452cf4">Gogs</h2>
+<div class="outline-text-2" id="text-orgd452cf4">
 <p>
 Lightweight git project hosting system. You can mirror projects from Github, or if Github turns evil then just host your own projects while retaining the familiar <i>fork-and-pull</i> workflow. If you can use Github then you can also use Gogs.
 </p>
 </p>
 </div>
 </div>
-<div id="outline-container-org8fd1e52" class="outline-2">
-<h2 id="org8fd1e52">HTMLy</h2>
-<div class="outline-text-2" id="text-org8fd1e52">
+<div id="outline-container-orgb5de05c" class="outline-2">
+<h2 id="orgb5de05c">HTMLy</h2>
+<div class="outline-text-2" id="text-orgb5de05c">
 <p>
 Databaseless blogging system. Quite simple and with a markdown-like format.
 </p>
 </p>
 </div>
 </div>
-<div id="outline-container-org70040fe" class="outline-2">
-<h2 id="org70040fe">Hubzilla</h2>
-<div class="outline-text-2" id="text-org70040fe">
+<div id="outline-container-org3a9c19a" class="outline-2">
+<h2 id="org3a9c19a">Hubzilla</h2>
+<div class="outline-text-2" id="text-org3a9c19a">
 <p>
 Web publishing platform with social network like features and good privacy controls so that it's possible to specify who can see which content. Includes photo albums, calendar, wiki and file storage.
 </p>
 </p>
 </div>
 </div>
-<div id="outline-container-org64ccd5e" class="outline-2">
-<h2 id="org64ccd5e">Icecast media stream</h2>
-<div class="outline-text-2" id="text-org64ccd5e">
+<div id="outline-container-org8953dcb" class="outline-2">
+<h2 id="org8953dcb">Icecast media stream</h2>
+<div class="outline-text-2" id="text-org8953dcb">
 <p>
 Make your own internet radio station.
 </p>
 </p>
 </div>
 </div>
-<div id="outline-container-org73319d7" class="outline-2">
-<h2 id="org73319d7">IRC Server (ngirc)</h2>
-<div class="outline-text-2" id="text-org73319d7">
+<div id="outline-container-org26745fc" class="outline-2">
+<h2 id="org26745fc">IRC Server (ngirc)</h2>
+<div class="outline-text-2" id="text-org26745fc">
 <p>
 Run your own IRC chat channel which can be secured with a password and accessible via an onion address. A bouncer is included so that you can receive messages sent while you were offline. Works with Hexchat and other popular clients.
 </p>
 </p>
 </div>
 </div>
-<div id="outline-container-orgd03beb7" class="outline-2">
-<h2 id="orgd03beb7">Jitsi Meet</h2>
-<div class="outline-text-2" id="text-orgd03beb7">
+<div id="outline-container-orgb904691" class="outline-2">
+<h2 id="orgb904691">Jitsi Meet</h2>
+<div class="outline-text-2" id="text-orgb904691">
 <p>
 Experimental WebRTC video conferencing system, similar to Google Hangouts. This may not be fully functional, but is hoped to be in the near future.
 </p>
 </div>
 </div>
 
-<div id="outline-container-org4b6a6a3" class="outline-2">
-<h2 id="org4b6a6a3">KanBoard</h2>
-<div class="outline-text-2" id="text-org4b6a6a3">
+<div id="outline-container-org7b034bc" class="outline-2">
+<h2 id="org7b034bc">KanBoard</h2>
+<div class="outline-text-2" id="text-org7b034bc">
 <p>
 A simple kanban system for managing projects or TODO lists.
 </p>
 </p>
 </div>
 </div>
-<div id="outline-container-orge157028" class="outline-2">
-<h2 id="orge157028">Key Server</h2>
-<div class="outline-text-2" id="text-orge157028">
+<div id="outline-container-org1c65b4a" class="outline-2">
+<h2 id="org1c65b4a">Key Server</h2>
+<div class="outline-text-2" id="text-org1c65b4a">
 <p>
 An OpenPGP key server for storing and retrieving GPG public keys.
 </p>
 </p>
 </div>
 </div>
-<div id="outline-container-org090bd37" class="outline-2">
-<h2 id="org090bd37">Koel</h2>
-<div class="outline-text-2" id="text-org090bd37">
+<div id="outline-container-org0cbbb3a" class="outline-2">
+<h2 id="org0cbbb3a">Koel</h2>
+<div class="outline-text-2" id="text-org0cbbb3a">
 <p>
 Access your music collection from any internet connected device.
 </p>
 </p>
 </div>
 </div>
-<div id="outline-container-org1c5934b" class="outline-2">
-<h2 id="org1c5934b">Lychee</h2>
-<div class="outline-text-2" id="text-org1c5934b">
+<div id="outline-container-orgd9ad54f" class="outline-2">
+<h2 id="orgd9ad54f">Lychee</h2>
+<div class="outline-text-2" id="text-orgd9ad54f">
 <p>
 Make your photo albums available on the web.
 </p>
 </p>
 </div>
 </div>
-<div id="outline-container-org3cf360f" class="outline-2">
-<h2 id="org3cf360f">Mailpile</h2>
-<div class="outline-text-2" id="text-org3cf360f">
+<div id="outline-container-orge6a1bee" class="outline-2">
+<h2 id="orge6a1bee">Mailpile</h2>
+<div class="outline-text-2" id="text-orge6a1bee">
 <p>
 Modern email client which supports GPG encryption.
 </p>
 </p>
 </div>
 </div>
-<div id="outline-container-org62684b4" class="outline-2">
-<h2 id="org62684b4">Matrix</h2>
-<div class="outline-text-2" id="text-org62684b4">
+<div id="outline-container-org88a3c1b" class="outline-2">
+<h2 id="org88a3c1b">Matrix</h2>
+<div class="outline-text-2" id="text-org88a3c1b">
 <p>
 Multi-user chat with some security and moderation controls.
 </p>
 </p>
 </div>
 </div>
-<div id="outline-container-org67c8d9c" class="outline-2">
-<h2 id="org67c8d9c">Mediagoblin</h2>
-<div class="outline-text-2" id="text-org67c8d9c">
+<div id="outline-container-orgca43d7f" class="outline-2">
+<h2 id="orgca43d7f">Mediagoblin</h2>
+<div class="outline-text-2" id="text-orgca43d7f">
 <p>
 Publicly host video and audio files so that you don't need to use YouTube/Vimeo/etc.
 </p>
 </p>
 </div>
 </div>
-<div id="outline-container-org35f9d59" class="outline-2">
-<h2 id="org35f9d59">Mumble</h2>
-<div class="outline-text-2" id="text-org35f9d59">
+<div id="outline-container-org8c5a11e" class="outline-2">
+<h2 id="org8c5a11e">Mumble</h2>
+<div class="outline-text-2" id="text-org8c5a11e">
 <p>
 The popular VoIP and text chat system. Say goodbye to old-fashioned telephony conferences with silly dial codes. Also works well on mobile.
 </p>
 </p>
 </div>
 </div>
-<div id="outline-container-org4e83692" class="outline-2">
-<h2 id="org4e83692">NextCloud</h2>
-<div class="outline-text-2" id="text-org4e83692">
+<div id="outline-container-org4a26fd8" class="outline-2">
+<h2 id="org4a26fd8">NextCloud</h2>
+<div class="outline-text-2" id="text-org4a26fd8">
 <p>
 Store files on your server and sync them with laptops or mobile devices. Includes many plugins including videoconferencing and collaborative document editing.
 </p>
 </p>
 </div>
 </div>
-<div id="outline-container-org38f233d" class="outline-2">
-<h2 id="org38f233d">PI-Hole</h2>
-<div class="outline-text-2" id="text-org38f233d">
+<div id="outline-container-orgda0e181" class="outline-2">
+<h2 id="orgda0e181">PeerTube</h2>
+<div class="outline-text-2" id="text-orgda0e181">
+<p>
+Peer-to-peer video hosting. Similar to Mediagoblin, but the P2P aspect better enables the streaming load to be shared across servers.
+</p>
+
+<p>
+<a href="./app_peertube.html">How to use it</a>
+</p>
+</div>
+</div>
+<div id="outline-container-orgfdd0292" class="outline-2">
+<h2 id="orgfdd0292">PI-Hole</h2>
+<div class="outline-text-2" id="text-orgfdd0292">
 <p>
 The black hole for web adverts. Block adverts at the domain name level within your local network. It can significantly reduce bandwidth, speed up page load times and protect your systems from being tracked by spyware.
 </p>
 </p>
 </div>
 </div>
-<div id="outline-container-orgc0768d8" class="outline-2">
-<h2 id="orgc0768d8">Pleroma</h2>
-<div class="outline-text-2" id="text-orgc0768d8">
+<div id="outline-container-orga14f200" class="outline-2">
+<h2 id="orga14f200">Pleroma</h2>
+<div class="outline-text-2" id="text-orga14f200">
 <p>
 Pleroma is an OStatus-compatible social networking server, compatible with GNU Social, PostActiv and Mastodon. It is high-performance and so is especially well suited for running on low power single board computers without much RAM.
 </p>
 </p>
 </div>
 </div>
-<div id="outline-container-orgb849d85" class="outline-2">
-<h2 id="orgb849d85">PostActiv</h2>
-<div class="outline-text-2" id="text-orgb849d85">
+<div id="outline-container-org5e17da3" class="outline-2">
+<h2 id="org5e17da3">PostActiv</h2>
+<div class="outline-text-2" id="text-org5e17da3">
 <p>
 An alternative federated social networking system compatible with GNU Social, Pleroma and Mastodon. It includes some optimisations and fixes currently not available within the main GNU Social project.
 </p>
 </p>
 </div>
 </div>
-<div id="outline-container-org1eccd38" class="outline-2">
-<h2 id="org1eccd38">Profanity</h2>
-<div class="outline-text-2" id="text-org1eccd38">
+<div id="outline-container-org517a50e" class="outline-2">
+<h2 id="org517a50e">Profanity</h2>
+<div class="outline-text-2" id="text-org517a50e">
 <p>
 A shell based XMPP client which you can run on the Freedombone server via ssh.
 </p>
 </p>
 </div>
 </div>
-<div id="outline-container-org7ba8023" class="outline-2">
-<h2 id="org7ba8023">Riot Web</h2>
-<div class="outline-text-2" id="text-org7ba8023">
+<div id="outline-container-org0c8c8d9" class="outline-2">
+<h2 id="org0c8c8d9">Riot Web</h2>
+<div class="outline-text-2" id="text-org0c8c8d9">
 <p>
 A browser based user interface for the Matrix federated communications system, including WebRTC audio and video chat.
 </p>
 </p>
 </div>
 </div>
-<div id="outline-container-orge5ba7bf" class="outline-2">
-<h2 id="orge5ba7bf">SearX</h2>
-<div class="outline-text-2" id="text-orge5ba7bf">
+<div id="outline-container-org0901ef0" class="outline-2">
+<h2 id="org0901ef0">SearX</h2>
+<div class="outline-text-2" id="text-org0901ef0">
 <p>
 A metasearch engine for customised and private web searches.
 </p>
 </p>
 </div>
 </div>
-<div id="outline-container-org1ddca20" class="outline-2">
-<h2 id="org1ddca20">tt-rss</h2>
-<div class="outline-text-2" id="text-org1ddca20">
+<div id="outline-container-org6403f0a" class="outline-2">
+<h2 id="org6403f0a">tt-rss</h2>
+<div class="outline-text-2" id="text-org6403f0a">
 <p>
 Private RSS reader. Pulls in RSS/Atom feeds via Tor and is only accessible via an onion address. Have "<i>the right to read</i>" without the Surveillance State knowing what you're reading. Also available with a user interface suitable for viewing on mobile devices via a browser such as OrFox.
 </p>
 </p>
 </div>
 </div>
-<div id="outline-container-org2602a28" class="outline-2">
-<h2 id="org2602a28">Syncthing</h2>
-<div class="outline-text-2" id="text-org2602a28">
+<div id="outline-container-orgdeec7a4" class="outline-2">
+<h2 id="orgdeec7a4">Syncthing</h2>
+<div class="outline-text-2" id="text-orgdeec7a4">
 <p>
 Possibly the best way to synchronise files across all of your devices. Once it has been set up it "just works" with no user intervention needed.
 </p>
 </p>
 </div>
 </div>
-<div id="outline-container-org80ed846" class="outline-2">
-<h2 id="org80ed846">Tahoe-LAFS</h2>
-<div class="outline-text-2" id="text-org80ed846">
+<div id="outline-container-org5a6843f" class="outline-2">
+<h2 id="org5a6843f">Tahoe-LAFS</h2>
+<div class="outline-text-2" id="text-org5a6843f">
 <p>
 Robust and encrypted storage of files on one or more server.
 </p>
 </p>
 </div>
 </div>
-<div id="outline-container-orgdc397e9" class="outline-2">
-<h2 id="orgdc397e9">Tox</h2>
-<div class="outline-text-2" id="text-orgdc397e9">
+<div id="outline-container-org4e08973" class="outline-2">
+<h2 id="org4e08973">Tox</h2>
+<div class="outline-text-2" id="text-org4e08973">
 <p>
 Client and bootstrap node for the Tox chat/VoIP system.
 </p>
 </p>
 </div>
 </div>
-<div id="outline-container-org588d32f" class="outline-2">
-<h2 id="org588d32f">Turtl</h2>
-<div class="outline-text-2" id="text-org588d32f">
+<div id="outline-container-orgd3b3f1e" class="outline-2">
+<h2 id="orgd3b3f1e">Turtl</h2>
+<div class="outline-text-2" id="text-orgd3b3f1e">
 <p>
 A system for privately creating and sharing notes and images, similar to Evernote but without the spying.
 </p>
 </p>
 </div>
 </div>
-<div id="outline-container-org248d732" class="outline-2">
-<h2 id="org248d732">Vim</h2>
-<div class="outline-text-2" id="text-org248d732">
+<div id="outline-container-org823c7ff" class="outline-2">
+<h2 id="org823c7ff">Vim</h2>
+<div class="outline-text-2" id="text-org823c7ff">
 <p>
 If you use the Mutt client to read your email then this will set it up to use vim for composing new mail.
 </p>
 </div>
 </div>
 
-<div id="outline-container-org880e1f3" class="outline-2">
-<h2 id="org880e1f3">Virtual Private Network (VPN)</h2>
-<div class="outline-text-2" id="text-org880e1f3">
+<div id="outline-container-org3535c47" class="outline-2">
+<h2 id="org3535c47">Virtual Private Network (VPN)</h2>
+<div class="outline-text-2" id="text-org3535c47">
 <p>
 Set up a VPN on your server so that you can bypass local internet censorship.
 </p>
 </p>
 </div>
 </div>
-<div id="outline-container-org3697e9f" class="outline-2">
-<h2 id="org3697e9f">XMPP</h2>
-<div class="outline-text-2" id="text-org3697e9f">
+<div id="outline-container-orgaadabb5" class="outline-2">
+<h2 id="orgaadabb5">XMPP</h2>
+<div class="outline-text-2" id="text-orgaadabb5">
 <p>
 Chat server which can be used together with client such as Gajim or Conversations to provide end-to-end content security and also onion routed metadata security. Includes advanced features such as <i>client state notification</i> to save battery power on your mobile devices, support for seamless roaming between networks and <i>message carbons</i> so that you can receive the same messages while being simultaneously logged in to your account on more than one device.
 </p>

website/EN/armbian.html

 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
 <head>
-<!-- 2017-09-21 Thu 11:11 -->
+<!-- 2017-11-28 Tue 17:02 -->
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <title>&lrm;</title>
 
 <center><h1>Installing on Armbian</h1></center>
 
+<blockquote>
+<p>
+"<i>we are the music makers, we are the dreamers of dreams. cyberpunks and pirates. chaotic spectres hauting cyberspace. engineers, artists, hackers.</i>"
+</p>
+</blockquote>
+
 <p>
 If you have a single board ARM computer which isn't one of the supported ones then you can probably still install Freedombone onto it if it has a <a href="https://www.armbian.com/download/">Debian Stretch Armbian image</a> available for it.
 </p>