From ace52490abe20021dc98f658144e0ede8f9fbf92 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Wed, 10 Jan 2018 21:00:56 +0000 Subject: [PATCH 01/15] privatebin app --- src/freedombone-app-privatebin | 454 +++++++++++++++++++++++++++++++++ 1 file changed, 454 insertions(+) create mode 100755 src/freedombone-app-privatebin diff --git a/src/freedombone-app-privatebin b/src/freedombone-app-privatebin new file mode 100755 index 00000000..184ee4dd --- /dev/null +++ b/src/freedombone-app-privatebin @@ -0,0 +1,454 @@ +#!/bin/bash +# +# .---. . . +# | | | +# |--- .--. .-. .-. .-.| .-. .--.--. |.-. .-. .--. .-. +# | | (.-' (.-' ( | ( )| | | | )( )| | (.-' +# ' ' --' --' -' - -' ' ' -' -' -' ' - --' +# +# Freedom in the Cloud +# +# privatebin application +# +# License +# ======= +# +# Copyright (C) 2018 Bob Mottram +# +# 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 . + +VARIANTS='full full-vim writer' + +IN_DEFAULT_INSTALL=0 +SHOW_ON_ABOUT=1 + +PRIVATEBIN_DOMAIN_NAME= +PRIVATEBIN_CODE= +PRIVATEBIN_ONION_PORT=8150 +PRIVATEBIN_REPO="https://github.com/PrivateBin/PrivateBin" +PRIVATEBIN_COMMIT='9c132cd839fd5e91da18e4a1e8ebef64fce605fb' +PRIVATEBIN_ADMIN_PASSWORD= + +privatebin_variables=(ONION_ONLY + PRIVATEBIN_DOMAIN_NAME + PRIVATEBIN_CODE + DDNS_PROVIDER + MY_USERNAME) + +function secure_privatebin { + pbpath="/var/www/$PRIVATEBIN_DOMAIN_NAME/htdocs" + pbdata="/var/www/$PRIVATEBIN_DOMAIN_NAME/htdocs/data" + htgroup='www-data' + rootuser='root' + + find "${pbpath}/" -type f -print0 | xargs -0 chmod 0640 + find "${pbpath}/" -type d -print0 | xargs -0 chmod 0550 + find "${pbdata}/" -type f -print0 | xargs -0 chmod 0640 + find "${pbdata}/" -type d -print0 | xargs -0 chmod 0750 + + chown -R ${rootuser}:${htgroup} "${pbpath}/" +} + +function logging_on_privatebin { + echo -n '' +} + +function logging_off_privatebin { + echo -n '' +} + +function remove_user_privatebin { + remove_username="$1" +} + +function add_user_privatebin { + new_username="$1" + new_user_password="$2" + + echo '0' +} + +function install_interactive_privatebin { + if [ ! $ONION_ONLY ]; then + ONION_ONLY='no' + fi + + if [[ $ONION_ONLY != "no" ]]; then + PRIVATEBIN_DOMAIN_NAME='privatebin.local' + else + PRIVATEBIN_DETAILS_COMPLETE= + while [ ! $PRIVATEBIN_DETAILS_COMPLETE ] + do + data=$(tempfile 2>/dev/null) + trap "rm -f $data" 0 1 2 5 15 + if [[ $DDNS_PROVIDER == "default@freedns.afraid.org" ]]; then + dialog --backtitle $"Freedombone Configuration" \ + --title $"PrivateBin Configuration" \ + --form $"\nPlease enter your privatebin details. The background image URL can be left blank.\n\nIMPORTANT: This should be a domain name which is supported by Let's Encrypt:" 16 65 4 \ + $"Domain:" 1 1 "$(grep 'PRIVATEBIN_DOMAIN_NAME' temp.cfg | awk -F '=' '{print $2}')" 1 25 33 40 \ + $"Code:" 2 1 "$(grep 'PRIVATEBIN_CODE' temp.cfg | awk -F '=' '{print $2}')" 4 25 33 255 \ + 2> $data + else + dialog --backtitle $"Freedombone Configuration" \ + --title $"PrivateBin Configuration" \ + --form $"\nPlease enter your privatebin details. The background image URL can be left blank.\n\nIMPORTANT: This should be a domain name which is supported by Let's Encrypt:" 16 65 4 \ + $"Domain:" 1 1 "$(grep 'PRIVATEBIN_DOMAIN_NAME' temp.cfg | awk -F '=' '{print $2}')" 1 25 33 40 \ + 2> $data + fi + sel=$? + case $sel in + 1) exit 1;; + 255) exit 1;; + esac + PRIVATEBIN_DOMAIN_NAME=$(cat $data | sed -n 1p) + if [ $PRIVATEBIN_DOMAIN_NAME ]; then + if [[ $PRIVATEBIN_DOMAIN_NAME == "$HUBZILLA_DOMAIN_NAME" ]]; then + PRIVATEBIN_DOMAIN_NAME="" + fi + TEST_DOMAIN_NAME=$PRIVATEBIN_DOMAIN_NAME + validate_domain_name + if [[ $TEST_DOMAIN_NAME != $PRIVATEBIN_DOMAIN_NAME ]]; then + PRIVATEBIN_DOMAIN_NAME= + dialog --title $"Domain name validation" --msgbox "$TEST_DOMAIN_NAME" 15 50 + else + if [[ $DDNS_PROVIDER == "default@freedns.afraid.org" ]]; then + PRIVATEBIN_CODE=$(cat $data | sed -n 2p) + validate_freedns_code "$PRIVATEBIN_CODE" + if [ ! $VALID_CODE ]; then + PRIVATEBIN_DOMAIN_NAME= + fi + fi + fi + fi + if [ $PRIVATEBIN_DOMAIN_NAME ]; then + PRIVATEBIN_DETAILS_COMPLETE="yes" + fi + done + + write_config_param "PRIVATEBIN_CODE" "$PRIVATEBIN_CODE" + fi + write_config_param "PRIVATEBIN_DOMAIN_NAME" "$PRIVATEBIN_DOMAIN_NAME" + APP_INSTALLED=1 +} + +function change_password_privatebin { + curr_username="$1" + new_user_password="$2" +} + +function reconfigure_privatebin { + echo -n '' +} + +function upgrade_privatebin { + CURR_PRIVATEBIN_COMMIT=$(get_completion_param "privatebin commit") + if [[ "$CURR_PRIVATEBIN_COMMIT" == "$PRIVATEBIN_COMMIT" ]]; then + return + fi + + if grep -q "privatebin domain" $COMPLETION_FILE; then + PRIVATEBIN_DOMAIN_NAME=$(get_completion_param "privatebin domain") + fi + + # update to the next commit + function_check set_repo_commit + set_repo_commit /var/www/$PRIVATEBIN_DOMAIN_NAME/htdocs "privatebin commit" "$PRIVATEBIN_COMMIT" $PRIVATEBIN_REPO + + secure_privatebin +} + + +function backup_local_privatebin { + PRIVATEBIN_DOMAIN_NAME='privatebin' + if grep -q "privatebin domain" $COMPLETION_FILE; then + PRIVATEBIN_DOMAIN_NAME=$(get_completion_param "privatebin domain") + fi + + source_directory=/var/www/${PRIVATEBIN_DOMAIN_NAME}/htdocs/data + + function_check suspend_site + suspend_site ${PRIVATEBIN_DOMAIN_NAME} + + function_check backup_directory_to_usb + dest_directory=privatebin + backup_directory_to_usb $source_directory $dest_directory + + function_check restart_site + restart_site +} + +function restore_local_privatebin { + if ! grep -q "privatebin domain" $COMPLETION_FILE; then + return + fi + PRIVATEBIN_DOMAIN_NAME=$(get_completion_param "privatebin domain") + if [ $PRIVATEBIN_DOMAIN_NAME ]; then + echo $"Restoring privatebin" + temp_restore_dir=/root/tempprivatebin + privatebin_dir=/var/www/${PRIVATEBIN_DOMAIN_NAME}/htdocs/data + + function_check restore_directory_from_usb + restore_directory_from_usb $temp_restore_dir privatebin + if [ -d $temp_restore_dir ]; then + if [ -d cp $temp_restore_dir$privatebin_dir ]; then + cp -rp $temp_restore_dir$privatebin_dir/* $privatebin_dir/ + else + cp -rp $temp_restore_dir/* $privatebin_dir/ + fi + secure_privatebin + rm -rf $temp_restore_dir + fi + + echo $"Restore of privatebin complete" + fi +} + +function backup_remote_privatebin { + PRIVATEBIN_DOMAIN_NAME='privatebin' + if grep -q "privatebin domain" $COMPLETION_FILE; then + PRIVATEBIN_DOMAIN_NAME=$(get_completion_param "privatebin domain") + fi + + source_directory=/var/www/${PRIVATEBIN_DOMAIN_NAME}/htdocs/data + + function_check suspend_site + suspend_site ${PRIVATEBIN_DOMAIN_NAME} + + function_check backup_directory_to_friend + dest_directory=privatebin + backup_directory_to_friend $source_directory $dest_directory + + function_check restart_site + restart_site +} + +function restore_remote_privatebin { + if ! grep -q "privatebin domain" $COMPLETION_FILE; then + return + fi + PRIVATEBIN_DOMAIN_NAME=$(get_completion_param "privatebin domain") + if [ $PRIVATEBIN_DOMAIN_NAME ]; then + temp_restore_dir=/root/tempprivatebin + privatebin_dir=/var/www/${PRIVATEBIN_DOMAIN_NAME}/htdocs/data + + function_check restore_directory_from_friend + restore_directory_from_friend $temp_restore_dir privatebin + if [ -d $temp_restore_dir ]; then + if [ -d cp $temp_restore_dir$privatebin_dir ]; then + cp -rp $temp_restore_dir$privatebin_dir/* $privatebin_dir/ + else + cp -rp $temp_restore_dir/* $privatebin_dir/ + fi + secure_privatebin + rm -rf $temp_restore_dir + fi + fi +} + +function remove_privatebin { + if [ ${#PRIVATEBIN_DOMAIN_NAME} -eq 0 ]; then + return + fi + read_config_param "PRIVATEBIN_DOMAIN_NAME" + read_config_param "MY_USERNAME" + echo "Removing $PRIVATEBIN_DOMAIN_NAME" + nginx_dissite $PRIVATEBIN_DOMAIN_NAME + remove_certs $PRIVATEBIN_DOMAIN_NAME + + if [ -d /var/www/$PRIVATEBIN_DOMAIN_NAME ]; then + rm -rf /var/www/$PRIVATEBIN_DOMAIN_NAME + fi + if [ -f /etc/nginx/sites-available/$PRIVATEBIN_DOMAIN_NAME ]; then + rm /etc/nginx/sites-available/$PRIVATEBIN_DOMAIN_NAME + fi + function_check remove_onion_service + remove_onion_service privatebin ${PRIVATEBIN_ONION_PORT} + if grep -q "privatebin" /etc/crontab; then + sed -i "/privatebin/d" /etc/crontab + fi + remove_app privatebin + remove_completion_param install_privatebin + sed -i '/privatebin/d' $COMPLETION_FILE + + function_check remove_ddns_domain + remove_ddns_domain $PRIVATEBIN_DOMAIN_NAME +} + +function install_privatebin { + if [ ! $ONION_ONLY ]; then + ONION_ONLY='no' + fi + + if [ ! $PRIVATEBIN_DOMAIN_NAME ]; then + echo $'No domain name was given for privatebin' + exit 7359 + fi + + apt-get -yq install php-gettext php-curl php-gd php-mysql git curl + apt-get -yq install memcached php-memcached php-intl exiftool libfcgi0ldbl + + if [ ! -d /var/www/$PRIVATEBIN_DOMAIN_NAME ]; then + mkdir /var/www/$PRIVATEBIN_DOMAIN_NAME + fi + if [ ! -d /var/www/$PRIVATEBIN_DOMAIN_NAME/htdocs ]; then + + if [ -d /repos/privatebin ]; then + mkdir /var/www/$PRIVATEBIN_DOMAIN_NAME/htdocs + cp -r -p /repos/privatebin/. /var/www/$PRIVATEBIN_DOMAIN_NAME/htdocs + cd /var/www/$PRIVATEBIN_DOMAIN_NAME/htdocs + git pull + else + function_check git_clone + git_clone $PRIVATEBIN_REPO /var/www/$PRIVATEBIN_DOMAIN_NAME/htdocs + fi + + if [ ! -d /var/www/$PRIVATEBIN_DOMAIN_NAME/htdocs ]; then + echo $'Unable to clone privatebin repo' + exit 63763873 + fi + fi + + cd /var/www/$PRIVATEBIN_DOMAIN_NAME/htdocs + git checkout $PRIVATEBIN_COMMIT -b $PRIVATEBIN_COMMIT + set_completion_param "privatebin commit" "$PRIVATEBIN_COMMIT" + + chmod g+w /var/www/$PRIVATEBIN_DOMAIN_NAME/htdocs + chown -R www-data:www-data /var/www/$PRIVATEBIN_DOMAIN_NAME/htdocs + + function_check add_ddns_domain + add_ddns_domain $PRIVATEBIN_DOMAIN_NAME + + PRIVATEBIN_ONION_HOSTNAME=$(add_onion_service privatebin 80 ${PRIVATEBIN_ONION_PORT}) + + privatebin_nginx_site=/etc/nginx/sites-available/$PRIVATEBIN_DOMAIN_NAME + if [[ $ONION_ONLY == "no" ]]; then + function_check nginx_http_redirect + nginx_http_redirect $PRIVATEBIN_DOMAIN_NAME "index index.php" + echo 'server {' >> $privatebin_nginx_site + echo ' listen 443 ssl;' >> $privatebin_nginx_site + echo ' listen [::]:443 ssl;' >> $privatebin_nginx_site + echo " server_name $PRIVATEBIN_DOMAIN_NAME;" >> $privatebin_nginx_site + echo '' >> $privatebin_nginx_site + function_check nginx_compress + nginx_compress $PRIVATEBIN_DOMAIN_NAME + echo '' >> $privatebin_nginx_site + echo ' # Security' >> $privatebin_nginx_site + function_check nginx_ssl + nginx_ssl $PRIVATEBIN_DOMAIN_NAME + + function_check nginx_disable_sniffing + nginx_disable_sniffing $PRIVATEBIN_DOMAIN_NAME + + echo ' add_header Strict-Transport-Security max-age=15768000;' >> $privatebin_nginx_site + echo '' >> $privatebin_nginx_site + echo ' # Logs' >> $privatebin_nginx_site + echo ' access_log /dev/null;' >> $privatebin_nginx_site + echo ' error_log /dev/null;' >> $privatebin_nginx_site + echo '' >> $privatebin_nginx_site + echo " root /var/www/$PRIVATEBIN_DOMAIN_NAME/htdocs;" >> $privatebin_nginx_site + echo '' >> $privatebin_nginx_site + echo ' index index.php;' >> $privatebin_nginx_site + echo '' >> $privatebin_nginx_site + echo ' location ~ \.php {' >> $privatebin_nginx_site + echo ' include snippets/fastcgi-php.conf;' >> $privatebin_nginx_site + echo ' fastcgi_pass unix:/var/run/php/php7.0-fpm.sock;' >> $privatebin_nginx_site + echo ' fastcgi_read_timeout 30;' >> $privatebin_nginx_site + echo ' }' >> $privatebin_nginx_site + echo '' >> $privatebin_nginx_site + echo ' # Location' >> $privatebin_nginx_site + echo ' location / {' >> $privatebin_nginx_site + function_check nginx_limits + nginx_limits $PRIVATEBIN_DOMAIN_NAME '15m' + echo ' try_files $uri $uri/ @privatebin;' >> $privatebin_nginx_site + echo ' }' >> $privatebin_nginx_site + echo '' >> $privatebin_nginx_site + echo ' # Restrict access that is unnecessary anyway' >> $privatebin_nginx_site + echo ' location ~ /\.(ht|git) {' >> $privatebin_nginx_site + echo ' deny all;' >> $privatebin_nginx_site + echo ' }' >> $privatebin_nginx_site + echo '}' >> $privatebin_nginx_site + echo '' >> $privatebin_nginx_site + else + echo -n '' > $privatebin_nginx_site + fi + echo 'server {' >> $privatebin_nginx_site + echo " listen 127.0.0.1:$PRIVATEBIN_ONION_PORT default_server;" >> $privatebin_nginx_site + echo " server_name $PRIVATEBIN_ONION_HOSTNAME;" >> $privatebin_nginx_site + echo '' >> $privatebin_nginx_site + function_check nginx_compress + nginx_compress $PRIVATEBIN_DOMAIN_NAME + echo '' >> $privatebin_nginx_site + function_check nginx_disable_sniffing + nginx_disable_sniffing $PRIVATEBIN_DOMAIN_NAME + echo '' >> $privatebin_nginx_site + echo ' # Logs' >> $privatebin_nginx_site + echo ' access_log /dev/null;' >> $privatebin_nginx_site + echo ' error_log /dev/null;' >> $privatebin_nginx_site + echo '' >> $privatebin_nginx_site + echo " root /var/www/$PRIVATEBIN_DOMAIN_NAME/htdocs;" >> $privatebin_nginx_site + echo '' >> $privatebin_nginx_site + echo ' index index.php;' >> $privatebin_nginx_site + echo '' >> $privatebin_nginx_site + echo ' location ~ \.php {' >> $privatebin_nginx_site + echo ' include snippets/fastcgi-php.conf;' >> $privatebin_nginx_site + echo ' fastcgi_pass unix:/var/run/php/php7.0-fpm.sock;' >> $privatebin_nginx_site + echo ' fastcgi_read_timeout 30;' >> $privatebin_nginx_site + echo ' }' >> $privatebin_nginx_site + echo '' >> $privatebin_nginx_site + echo ' # Location' >> $privatebin_nginx_site + echo ' location / {' >> $privatebin_nginx_site + function_check nginx_limits + nginx_limits $PRIVATEBIN_DOMAIN_NAME '15m' + echo ' try_files $uri $uri/ @privatebin;' >> $privatebin_nginx_site + echo ' }' >> $privatebin_nginx_site + echo '' >> $privatebin_nginx_site + echo ' # Restrict access that is unnecessary anyway' >> $privatebin_nginx_site + echo ' location ~ /\.(ht|git) {' >> $privatebin_nginx_site + echo ' deny all;' >> $privatebin_nginx_site + echo ' }' >> $privatebin_nginx_site + echo '}' >> $privatebin_nginx_site + + function_check configure_php + configure_php + + function_check create_site_certificate + create_site_certificate $PRIVATEBIN_DOMAIN_NAME 'yes' + + function_check nginx_ensite + nginx_ensite $PRIVATEBIN_DOMAIN_NAME + + cp /var/www/$PRIVATEBIN_DOMAIN_NAME/htdocs/cfg/conf.sample.php /var/www/$PRIVATEBIN_DOMAIN_NAME/htdocs/cfg/conf.php + + # Change some defaults + sed -i 's|; qrcode|qrcode|g' /var/www/$PRIVATEBIN_DOMAIN_NAME/htdocs/cfg/conf.php + sed -i 's|default =.*|default = "1day"|g' /var/www/$PRIVATEBIN_DOMAIN_NAME/htdocs/cfg/conf.php + sed -i 's|1week =|; 1week =|g' /var/www/$PRIVATEBIN_DOMAIN_NAME/htdocs/cfg/conf.php + sed -i 's|1month =|; 1month =|g' /var/www/$PRIVATEBIN_DOMAIN_NAME/htdocs/cfg/conf.php + sed -i 's|1year =|; 1year =|g' /var/www/$PRIVATEBIN_DOMAIN_NAME/htdocs/cfg/conf.php + sed -i 's|never =|; never =|g' /var/www/$PRIVATEBIN_DOMAIN_NAME/htdocs/cfg/conf.php + sed -i 's|limit =.*|limit = 30|g' /var/www/$PRIVATEBIN_DOMAIN_NAME/htdocs/cfg/conf.php + sed -i 's|sizelimit =.*|sizelimit = 32768|g' /var/www/$PRIVATEBIN_DOMAIN_NAME/htdocs/cfg/conf.php + sed -i 's|defaultformatter =.*|defaultformatter = "Markdown"|g' /var/www/$PRIVATEBIN_DOMAIN_NAME/htdocs/cfg/conf.php + + secure_privatebin + + systemctl restart php7.0-fpm + systemctl restart nginx + + set_completion_param "privatebin domain" "$PRIVATEBIN_DOMAIN_NAME" + + APP_INSTALLED=1 +} + +# NOTE: deliberately there is no "exit 0" From 105384c3c44af582baee3aebf2509418ec096fdf Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Wed, 10 Jan 2018 21:02:06 +0000 Subject: [PATCH 02/15] Include privatebin within images --- src/freedombone-image-customise | 1 + 1 file changed, 1 insertion(+) diff --git a/src/freedombone-image-customise b/src/freedombone-image-customise index 994e0326..5ba0f7a0 100755 --- a/src/freedombone-image-customise +++ b/src/freedombone-image-customise @@ -1672,6 +1672,7 @@ function image_preinstall_repos { git clone $KANBOARD_REPO $rootdir/repos/kanboard git clone $KEYSERVER_WEB_REPO $rootdir/repos/keyserverweb git clone $PEERTUBE_REPO $rootdir/repos/peertube + git clone $PRIVATEBIN_REPO $rootdir/repos/privatebin #git clone $WEKAN_REPO $rootdir/repos/wekan #git clone $FLOW_ROUTER_REPO $rootdir/repos/flowrouter #git clone $METEOR_USERACCOUNTS_REPO $rootdir/repos/meteoruseraccounts From 06ea80e36388ad8e6b8faec95656494fc7bf39bc Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Wed, 10 Jan 2018 21:08:24 +0000 Subject: [PATCH 03/15] privatebin dialog tweaks --- src/freedombone-app-privatebin | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/freedombone-app-privatebin b/src/freedombone-app-privatebin index 184ee4dd..4307e066 100755 --- a/src/freedombone-app-privatebin +++ b/src/freedombone-app-privatebin @@ -95,14 +95,14 @@ function install_interactive_privatebin { if [[ $DDNS_PROVIDER == "default@freedns.afraid.org" ]]; then dialog --backtitle $"Freedombone Configuration" \ --title $"PrivateBin Configuration" \ - --form $"\nPlease enter your privatebin details. The background image URL can be left blank.\n\nIMPORTANT: This should be a domain name which is supported by Let's Encrypt:" 16 65 4 \ + --form $"\nPlease enter your PrivateBin details. The background image URL can be left blank.\n\nIMPORTANT: This should be a domain name which is supported by Let's Encrypt:" 14 65 2 \ $"Domain:" 1 1 "$(grep 'PRIVATEBIN_DOMAIN_NAME' temp.cfg | awk -F '=' '{print $2}')" 1 25 33 40 \ - $"Code:" 2 1 "$(grep 'PRIVATEBIN_CODE' temp.cfg | awk -F '=' '{print $2}')" 4 25 33 255 \ + $"Code:" 2 1 "$(grep 'PRIVATEBIN_CODE' temp.cfg | awk -F '=' '{print $2}')" 2 25 33 255 \ 2> $data else dialog --backtitle $"Freedombone Configuration" \ --title $"PrivateBin Configuration" \ - --form $"\nPlease enter your privatebin details. The background image URL can be left blank.\n\nIMPORTANT: This should be a domain name which is supported by Let's Encrypt:" 16 65 4 \ + --form $"\nPlease enter your PrivateBin details. The background image URL can be left blank.\n\nIMPORTANT: This should be a domain name which is supported by Let's Encrypt:" 14 65 2 \ $"Domain:" 1 1 "$(grep 'PRIVATEBIN_DOMAIN_NAME' temp.cfg | awk -F '=' '{print $2}')" 1 25 33 40 \ 2> $data fi From b7cc77157669f5495043e7822c0180c15bfe4254 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Wed, 10 Jan 2018 21:11:49 +0000 Subject: [PATCH 04/15] privatebin dialog tweaks --- src/freedombone-app-privatebin | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/freedombone-app-privatebin b/src/freedombone-app-privatebin index 4307e066..a2777974 100755 --- a/src/freedombone-app-privatebin +++ b/src/freedombone-app-privatebin @@ -96,14 +96,14 @@ function install_interactive_privatebin { dialog --backtitle $"Freedombone Configuration" \ --title $"PrivateBin Configuration" \ --form $"\nPlease enter your PrivateBin details. The background image URL can be left blank.\n\nIMPORTANT: This should be a domain name which is supported by Let's Encrypt:" 14 65 2 \ - $"Domain:" 1 1 "$(grep 'PRIVATEBIN_DOMAIN_NAME' temp.cfg | awk -F '=' '{print $2}')" 1 25 33 40 \ - $"Code:" 2 1 "$(grep 'PRIVATEBIN_CODE' temp.cfg | awk -F '=' '{print $2}')" 2 25 33 255 \ + $"Domain:" 1 1 "$(grep 'PRIVATEBIN_DOMAIN_NAME' temp.cfg | awk -F '=' '{print $2}')" 1 15 33 40 \ + $"Code:" 2 1 "$(grep 'PRIVATEBIN_CODE' temp.cfg | awk -F '=' '{print $2}')" 2 15 33 255 \ 2> $data else dialog --backtitle $"Freedombone Configuration" \ --title $"PrivateBin Configuration" \ --form $"\nPlease enter your PrivateBin details. The background image URL can be left blank.\n\nIMPORTANT: This should be a domain name which is supported by Let's Encrypt:" 14 65 2 \ - $"Domain:" 1 1 "$(grep 'PRIVATEBIN_DOMAIN_NAME' temp.cfg | awk -F '=' '{print $2}')" 1 25 33 40 \ + $"Domain:" 1 1 "$(grep 'PRIVATEBIN_DOMAIN_NAME' temp.cfg | awk -F '=' '{print $2}')" 1 15 33 40 \ 2> $data fi sel=$? From 86ac7e00a98e26a03b40c90a22fb713470665be4 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Wed, 10 Jan 2018 21:17:00 +0000 Subject: [PATCH 05/15] Install libsodium for privatebin --- src/freedombone-app-privatebin | 1 + 1 file changed, 1 insertion(+) diff --git a/src/freedombone-app-privatebin b/src/freedombone-app-privatebin index a2777974..374d2e7b 100755 --- a/src/freedombone-app-privatebin +++ b/src/freedombone-app-privatebin @@ -297,6 +297,7 @@ function install_privatebin { apt-get -yq install php-gettext php-curl php-gd php-mysql git curl apt-get -yq install memcached php-memcached php-intl exiftool libfcgi0ldbl + apt-get -yq install php-libsodium libsodium18 if [ ! -d /var/www/$PRIVATEBIN_DOMAIN_NAME ]; then mkdir /var/www/$PRIVATEBIN_DOMAIN_NAME From 0c99738e51e3485b311671442c7264a0bd61d4e8 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Wed, 10 Jan 2018 21:24:43 +0000 Subject: [PATCH 06/15] Install mcrypt for privatebin --- src/freedombone-app-privatebin | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/freedombone-app-privatebin b/src/freedombone-app-privatebin index 374d2e7b..deb5d431 100755 --- a/src/freedombone-app-privatebin +++ b/src/freedombone-app-privatebin @@ -297,7 +297,7 @@ function install_privatebin { apt-get -yq install php-gettext php-curl php-gd php-mysql git curl apt-get -yq install memcached php-memcached php-intl exiftool libfcgi0ldbl - apt-get -yq install php-libsodium libsodium18 + apt-get -yq install php-libsodium libsodium18 php-mcrypt if [ ! -d /var/www/$PRIVATEBIN_DOMAIN_NAME ]; then mkdir /var/www/$PRIVATEBIN_DOMAIN_NAME From 8651acb1695e5f3b3d3e2c7981fdc98953c22a46 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Wed, 10 Jan 2018 21:25:04 +0000 Subject: [PATCH 07/15] Lower case --- src/freedombone-app-privatebin | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/freedombone-app-privatebin b/src/freedombone-app-privatebin index deb5d431..c4cc6cc7 100755 --- a/src/freedombone-app-privatebin +++ b/src/freedombone-app-privatebin @@ -440,7 +440,7 @@ function install_privatebin { sed -i 's|never =|; never =|g' /var/www/$PRIVATEBIN_DOMAIN_NAME/htdocs/cfg/conf.php sed -i 's|limit =.*|limit = 30|g' /var/www/$PRIVATEBIN_DOMAIN_NAME/htdocs/cfg/conf.php sed -i 's|sizelimit =.*|sizelimit = 32768|g' /var/www/$PRIVATEBIN_DOMAIN_NAME/htdocs/cfg/conf.php - sed -i 's|defaultformatter =.*|defaultformatter = "Markdown"|g' /var/www/$PRIVATEBIN_DOMAIN_NAME/htdocs/cfg/conf.php + sed -i 's|defaultformatter =.*|defaultformatter = "markdown"|g' /var/www/$PRIVATEBIN_DOMAIN_NAME/htdocs/cfg/conf.php secure_privatebin From 28d7a0fa2f0ed8629e994dc9f89cfaf5fb8e30f4 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Wed, 10 Jan 2018 21:36:50 +0000 Subject: [PATCH 08/15] Write permissions to data directory --- src/freedombone-app-privatebin | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/freedombone-app-privatebin b/src/freedombone-app-privatebin index c4cc6cc7..9535deb8 100755 --- a/src/freedombone-app-privatebin +++ b/src/freedombone-app-privatebin @@ -54,10 +54,9 @@ function secure_privatebin { find "${pbpath}/" -type f -print0 | xargs -0 chmod 0640 find "${pbpath}/" -type d -print0 | xargs -0 chmod 0550 - find "${pbdata}/" -type f -print0 | xargs -0 chmod 0640 - find "${pbdata}/" -type d -print0 | xargs -0 chmod 0750 chown -R ${rootuser}:${htgroup} "${pbpath}/" + chown -R www-data:www-data ${pbdata} } function logging_on_privatebin { @@ -442,6 +441,8 @@ function install_privatebin { sed -i 's|sizelimit =.*|sizelimit = 32768|g' /var/www/$PRIVATEBIN_DOMAIN_NAME/htdocs/cfg/conf.php sed -i 's|defaultformatter =.*|defaultformatter = "markdown"|g' /var/www/$PRIVATEBIN_DOMAIN_NAME/htdocs/cfg/conf.php + mkdir -p /var/www/$PRIVATEBIN_DOMAIN_NAME/htdocs/data + secure_privatebin systemctl restart php7.0-fpm From f2018a84661225bad56a32fb564f545b2601ecb8 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Wed, 10 Jan 2018 21:39:30 +0000 Subject: [PATCH 09/15] Language default --- src/freedombone-app-privatebin | 1 + 1 file changed, 1 insertion(+) diff --git a/src/freedombone-app-privatebin b/src/freedombone-app-privatebin index 9535deb8..62d370dd 100755 --- a/src/freedombone-app-privatebin +++ b/src/freedombone-app-privatebin @@ -433,6 +433,7 @@ function install_privatebin { # Change some defaults sed -i 's|; qrcode|qrcode|g' /var/www/$PRIVATEBIN_DOMAIN_NAME/htdocs/cfg/conf.php sed -i 's|default =.*|default = "1day"|g' /var/www/$PRIVATEBIN_DOMAIN_NAME/htdocs/cfg/conf.php + sed -i 's|languagedefault =.*|languagedefault = "en"|g' /var/www/$PRIVATEBIN_DOMAIN_NAME/htdocs/cfg/conf.php sed -i 's|1week =|; 1week =|g' /var/www/$PRIVATEBIN_DOMAIN_NAME/htdocs/cfg/conf.php sed -i 's|1month =|; 1month =|g' /var/www/$PRIVATEBIN_DOMAIN_NAME/htdocs/cfg/conf.php sed -i 's|1year =|; 1year =|g' /var/www/$PRIVATEBIN_DOMAIN_NAME/htdocs/cfg/conf.php From b91c3fe8cd824fe44782bddfc407d782040d273c Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Wed, 10 Jan 2018 21:41:59 +0000 Subject: [PATCH 10/15] There's no limit --- src/freedombone-app-privatebin | 1 - 1 file changed, 1 deletion(-) diff --git a/src/freedombone-app-privatebin b/src/freedombone-app-privatebin index 62d370dd..f67afc19 100755 --- a/src/freedombone-app-privatebin +++ b/src/freedombone-app-privatebin @@ -438,7 +438,6 @@ function install_privatebin { sed -i 's|1month =|; 1month =|g' /var/www/$PRIVATEBIN_DOMAIN_NAME/htdocs/cfg/conf.php sed -i 's|1year =|; 1year =|g' /var/www/$PRIVATEBIN_DOMAIN_NAME/htdocs/cfg/conf.php sed -i 's|never =|; never =|g' /var/www/$PRIVATEBIN_DOMAIN_NAME/htdocs/cfg/conf.php - sed -i 's|limit =.*|limit = 30|g' /var/www/$PRIVATEBIN_DOMAIN_NAME/htdocs/cfg/conf.php sed -i 's|sizelimit =.*|sizelimit = 32768|g' /var/www/$PRIVATEBIN_DOMAIN_NAME/htdocs/cfg/conf.php sed -i 's|defaultformatter =.*|defaultformatter = "markdown"|g' /var/www/$PRIVATEBIN_DOMAIN_NAME/htdocs/cfg/conf.php From c7016e9166ef56f2fbd7e6a71fa2fbec1eed693c Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Wed, 10 Jan 2018 21:44:08 +0000 Subject: [PATCH 11/15] Purge on every paste --- src/freedombone-app-privatebin | 1 + 1 file changed, 1 insertion(+) diff --git a/src/freedombone-app-privatebin b/src/freedombone-app-privatebin index f67afc19..a15f6a42 100755 --- a/src/freedombone-app-privatebin +++ b/src/freedombone-app-privatebin @@ -438,6 +438,7 @@ function install_privatebin { sed -i 's|1month =|; 1month =|g' /var/www/$PRIVATEBIN_DOMAIN_NAME/htdocs/cfg/conf.php sed -i 's|1year =|; 1year =|g' /var/www/$PRIVATEBIN_DOMAIN_NAME/htdocs/cfg/conf.php sed -i 's|never =|; never =|g' /var/www/$PRIVATEBIN_DOMAIN_NAME/htdocs/cfg/conf.php + sed -i 's|limit = 300|limit = 0|g' /var/www/$PRIVATEBIN_DOMAIN_NAME/htdocs/cfg/conf.php sed -i 's|sizelimit =.*|sizelimit = 32768|g' /var/www/$PRIVATEBIN_DOMAIN_NAME/htdocs/cfg/conf.php sed -i 's|defaultformatter =.*|defaultformatter = "markdown"|g' /var/www/$PRIVATEBIN_DOMAIN_NAME/htdocs/cfg/conf.php From ba582e17bf543003d224e6bfcdc5f8f66790e7e9 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Wed, 10 Jan 2018 21:48:44 +0000 Subject: [PATCH 12/15] More privatebin traffic limiting --- src/freedombone-app-privatebin | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/freedombone-app-privatebin b/src/freedombone-app-privatebin index a15f6a42..47998e46 100755 --- a/src/freedombone-app-privatebin +++ b/src/freedombone-app-privatebin @@ -438,7 +438,9 @@ function install_privatebin { sed -i 's|1month =|; 1month =|g' /var/www/$PRIVATEBIN_DOMAIN_NAME/htdocs/cfg/conf.php sed -i 's|1year =|; 1year =|g' /var/www/$PRIVATEBIN_DOMAIN_NAME/htdocs/cfg/conf.php sed -i 's|never =|; never =|g' /var/www/$PRIVATEBIN_DOMAIN_NAME/htdocs/cfg/conf.php + sed -i 's|limit = 10|limit = 30|g' /var/www/$PRIVATEBIN_DOMAIN_NAME/htdocs/cfg/conf.php sed -i 's|limit = 300|limit = 0|g' /var/www/$PRIVATEBIN_DOMAIN_NAME/htdocs/cfg/conf.php + sed -i 's|batchsize =.*|batchsize = 100|g' /var/www/$PRIVATEBIN_DOMAIN_NAME/htdocs/cfg/conf.php sed -i 's|sizelimit =.*|sizelimit = 32768|g' /var/www/$PRIVATEBIN_DOMAIN_NAME/htdocs/cfg/conf.php sed -i 's|defaultformatter =.*|defaultformatter = "markdown"|g' /var/www/$PRIVATEBIN_DOMAIN_NAME/htdocs/cfg/conf.php From 873828d00a69d0ebb300be5ecc09c71d165d125a Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Wed, 10 Jan 2018 22:22:47 +0000 Subject: [PATCH 13/15] privatebin documentation --- doc/EN/app_privatebin.org | 32 ++++ doc/EN/apps.org | 4 + website/EN/app_privatebin.html | 306 +++++++++++++++++++++++++++++++++ website/EN/apps.html | 248 +++++++++++++------------- 4 files changed, 472 insertions(+), 118 deletions(-) create mode 100644 doc/EN/app_privatebin.org create mode 100644 website/EN/app_privatebin.html diff --git a/doc/EN/app_privatebin.org b/doc/EN/app_privatebin.org new file mode 100644 index 00000000..eb5d5f3e --- /dev/null +++ b/doc/EN/app_privatebin.org @@ -0,0 +1,32 @@ +#+TITLE: +#+AUTHOR: Bob Mottram +#+EMAIL: bob@freedombone.net +#+KEYWORDS: freedombone, privatebin +#+DESCRIPTION: How to use PrivateBin +#+OPTIONS: ^:nil toc:nil +#+HTML_HEAD: + +#+BEGIN_CENTER +[[file:images/logo.png]] +#+END_CENTER + +#+BEGIN_EXPORT html +
+

PrivateBin

+
+#+END_EXPORT + +This is an encrypted pastebin, such that the server has zero knowledge of the content. It's intended for small amounts of text less than 32K in length. It's not intended for transfering large files, or for storing pastes for more than a day. + +Because this is completely open to any user on the internet you should be wary of the potential for DDoS, and only install this app if you really need to avoid using other pastebins or if other pastebin sites are censored or untrustable. There are traffic limits set within this app to attempt to minimize the potential for flooding attacks, but that might still not be sufficient in the worst cases. + +* Installation +Log into your system with: + +#+begin_src bash +ssh myusername@mydomain -p 2222 +#+end_src + +Using cursor keys, space bar and Enter key select *Administrator controls* and type in your password. + +Select *Add/Remove Apps* then *privatebin*. You'll need to enter your preferred subdomain - something like /paste.yourdomain.com/ and optionally a freedns code. diff --git a/doc/EN/apps.org b/doc/EN/apps.org index 013caced..a3e60551 100644 --- a/doc/EN/apps.org +++ b/doc/EN/apps.org @@ -136,6 +136,10 @@ The black hole for web adverts. Block adverts at the domain name level within yo 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. [[./app_postactiv.html][How to use it] +* PrivateBin +A pastebin where the server has zero knowledge of the content being pasted. + +[[./app_privatebin.html][How to use it]] * Profanity A shell based XMPP client which you can run on the Freedombone server via ssh. diff --git a/website/EN/app_privatebin.html b/website/EN/app_privatebin.html new file mode 100644 index 00000000..67ec1dfc --- /dev/null +++ b/website/EN/app_privatebin.html @@ -0,0 +1,306 @@ + + + + + + + +‎ + + + + + + + + + +
+ +
+
+
+ +
+

logo.png +

+
+
+ +
+

PrivateBin

+
+ +

+This is an encrypted pastebin, such that the server has zero knowledge of the content. It's intended for small amounts of text less than 32K in length. It's not intended for transfering large files, or for storing pastes for more than a day. +

+ +

+Because this is completely open to any user on the internet you should be wary of the potential for DDoS, and only install this app if you really need to avoid using other pastebins or if other pastebin sites are censored or untrustable. There are traffic limits set within this app to attempt to minimize the potential for flooding attacks, but that might still not be sufficient in the worst cases. +

+ +
+

Installation

+
+

+Log into your system with: +

+ +
+
ssh myusername@mydomain -p 2222
+
+
+ +

+Using cursor keys, space bar and Enter key select Administrator controls and type in your password. +

+ +

+Select Add/Remove Apps then privatebin. You'll need to enter your preferred subdomain - something like paste.yourdomain.com and optionally a freedns code. +

+
+
+
+
+ + + +
+Back to top | E-mail me +
+
+ + diff --git a/website/EN/apps.html b/website/EN/apps.html index 2183a8ef..29f18a6b 100644 --- a/website/EN/apps.html +++ b/website/EN/apps.html @@ -3,7 +3,7 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - + ‎ @@ -265,9 +265,9 @@ The base install of the system just contains an email server and Mutt client, bu -
-

Akaunting

-
+
+

Akaunting

+

A web based accounts system for small businesses or freelancers.

@@ -277,9 +277,9 @@ A web based accounts system for small businesses or freelancers.

-
-

CryptPad

-
+
+

CryptPad

+

Collaborate on editing documents, presentations and source code, or vote on things. All with a good level of security.

@@ -289,9 +289,9 @@ Collaborate on editing documents, presentations and source code, or vote on thin

-
-

DLNA

-
+
+

DLNA

+

Enables you to use the system as a music server which any DLNA compatible devices can connect to within your home network.

@@ -301,9 +301,9 @@ Enables you to use the system as a music server which any DLNA compatible device

-
-

Dokuwiki

-
+
+

Dokuwiki

+

A databaseless wiki system.

@@ -313,9 +313,9 @@ A databaseless wiki system.

-
-

Emacs

-
+
+

Emacs

+

If you use the Mutt client to read your email then this will set it up to use emacs for composing new mail.

@@ -325,9 +325,9 @@ If you use the Mutt client to read your email then this will set it up to use em

-
-

Etherpad

-
+
+

Etherpad

+

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.

@@ -337,9 +337,9 @@ Collaborate on creating documents in real time. Maybe you're planning a holiday

-
-

Federated wiki

-
+
+

Federated wiki

+

A new approach to creating wiki content.

@@ -349,9 +349,9 @@ A new approach to creating wiki content.

-
-

Friendica

-
+
+

Friendica

+

Federated social network system.

@@ -361,9 +361,9 @@ Federated social network system.

-
-

Ghost

-
+
+

Ghost

+

Modern looking blogging system.

@@ -373,9 +373,9 @@ Modern looking blogging system.

-
-

GNU Social

-
+
+

GNU Social

+

Federated social network based on the OStatus protocol. You can "remote follow" other users within the GNU Social federation.

@@ -385,9 +385,9 @@ Federated social network based on the OStatus protocol. You can "remote follo

-
-

Gogs

-
+
+

Gogs

+

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 fork-and-pull workflow. If you can use Github then you can also use Gogs.

@@ -397,9 +397,9 @@ Lightweight git project hosting system. You can mirror projects from Github, or

-
-

HTMLy

-
+
+

HTMLy

+

Databaseless blogging system. Quite simple and with a markdown-like format.

@@ -409,9 +409,9 @@ Databaseless blogging system. Quite simple and with a markdown-like format.

-
-

Hubzilla

-
+
+

Hubzilla

+

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.

@@ -421,9 +421,9 @@ Web publishing platform with social network like features and good privacy contr

-
-

Icecast media stream

-
+
+

Icecast media stream

+

Make your own internet radio station.

@@ -433,9 +433,9 @@ Make your own internet radio station.

-
-

IRC Server (ngirc)

-
+
+

IRC Server (ngirc)

+

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.

@@ -445,18 +445,18 @@ Run your own IRC chat channel which can be secured with a password and accessibl

-
-

Jitsi Meet

-
+
+

Jitsi Meet

+

Experimental WebRTC video conferencing system, similar to Google Hangouts. This may not be fully functional, but is hoped to be in the near future.

-
-

KanBoard

-
+
+

KanBoard

+

A simple kanban system for managing projects or TODO lists.

@@ -466,9 +466,9 @@ A simple kanban system for managing projects or TODO lists.

-
-

Key Server

-
+
+

Key Server

+

An OpenPGP key server for storing and retrieving GPG public keys.

@@ -478,9 +478,9 @@ An OpenPGP key server for storing and retrieving GPG public keys.

-
-

Koel

-
+
+

Koel

+

Access your music collection from any internet connected device.

@@ -490,9 +490,9 @@ Access your music collection from any internet connected device.

-
-

Lychee

-
+
+

Lychee

+

Make your photo albums available on the web.

@@ -502,9 +502,9 @@ Make your photo albums available on the web.

-
-

Mailpile

-
+
+

Mailpile

+

Modern email client which supports GPG encryption.

@@ -514,9 +514,9 @@ Modern email client which supports GPG encryption.

-
-

Matrix

-
+
+

Matrix

+

Multi-user chat with some security and moderation controls.

@@ -526,9 +526,9 @@ Multi-user chat with some security and moderation controls.

-
-

Mediagoblin

-
+
+

Mediagoblin

+

Publicly host video and audio files so that you don't need to use YouTube/Vimeo/etc.

@@ -538,9 +538,9 @@ Publicly host video and audio files so that you don't need to use YouTube/Vimeo/

-
-

Mumble

-
+
+

Mumble

+

The popular VoIP and text chat system. Say goodbye to old-fashioned telephony conferences with silly dial codes. Also works well on mobile.

@@ -550,9 +550,9 @@ The popular VoIP and text chat system. Say goodbye to old-fashioned telephony co

-
-

NextCloud

-
+
+

NextCloud

+

Store files on your server and sync them with laptops or mobile devices. Includes many plugins including videoconferencing and collaborative document editing.

@@ -562,9 +562,9 @@ Store files on your server and sync them with laptops or mobile devices. Include

-
-

PeerTube

-
+
+

PeerTube

+

Peer-to-peer video hosting. Similar to Mediagoblin, but the P2P aspect better enables the streaming load to be shared across servers.

@@ -574,9 +574,9 @@ Peer-to-peer video hosting. Similar to Mediagoblin, but the P2P aspect better en

-
-

PI-Hole

-
+
+

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.

@@ -586,9 +586,9 @@ The black hole for web adverts. Block adverts at the domain name level within yo

-
-

PostActiv

-
+
+

PostActiv

+

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.

@@ -598,9 +598,21 @@ An alternative federated social networking system compatible with GNU Social, Pl

-
-

Profanity

-
+
+

PrivateBin

+
+

+A pastebin where the server has zero knowledge of the content being pasted. +

+ +

+How to use it +

+
+
+
+

Profanity

+

A shell based XMPP client which you can run on the Freedombone server via ssh.

@@ -610,9 +622,9 @@ A shell based XMPP client which you can run on the Freedombone server via ssh.

-
-

Riot Web

-
+
+

Riot Web

+

A browser based user interface for the Matrix federated communications system, including WebRTC audio and video chat.

@@ -622,9 +634,9 @@ A browser based user interface for the Matrix federated communications system, i

-
-

SearX

-
+
+

SearX

+

A metasearch engine for customised and private web searches.

@@ -634,9 +646,9 @@ A metasearch engine for customised and private web searches.

-
-

tt-rss

-
+
+

tt-rss

+

Private RSS reader. Pulls in RSS/Atom feeds via Tor and is only accessible via an onion address. Have "the right to read" 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.

@@ -646,9 +658,9 @@ Private RSS reader. Pulls in RSS/Atom feeds via Tor and is only accessible via a

-
-

Syncthing

-
+
+

Syncthing

+

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.

@@ -658,9 +670,9 @@ Possibly the best way to synchronise files across all of your devices. Once it h

-
-

Tahoe-LAFS

-
+
+

Tahoe-LAFS

+

Robust and encrypted storage of files on one or more server.

@@ -670,9 +682,9 @@ Robust and encrypted storage of files on one or more server.

-
-

Tox

-
+
+

Tox

+

Client and bootstrap node for the Tox chat/VoIP system.

@@ -682,9 +694,9 @@ Client and bootstrap node for the Tox chat/VoIP system.

-
-

Turtl

-
+
+

Turtl

+

A system for privately creating and sharing notes and images, similar to Evernote but without the spying.

@@ -694,18 +706,18 @@ A system for privately creating and sharing notes and images, similar to Evernot

-
-

Vim

-
+
+

Vim

+

If you use the Mutt client to read your email then this will set it up to use vim for composing new mail.

-
-

Virtual Private Network (VPN)

-
+
+

Virtual Private Network (VPN)

+

Set up a VPN on your server so that you can bypass local internet censorship.

@@ -715,9 +727,9 @@ Set up a VPN on your server so that you can bypass local internet censorship.

-
-

XMPP

-
+
+

XMPP

+

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 client state notification to save battery power on your mobile devices, support for seamless roaming between networks and message carbons so that you can receive the same messages while being simultaneously logged in to your account on more than one device.

From d5526731f1baae2330924b33abaf72cff9e5d846 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Wed, 10 Jan 2018 22:24:43 +0000 Subject: [PATCH 14/15] Missing bracket --- doc/EN/apps.org | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/EN/apps.org b/doc/EN/apps.org index a3e60551..b1d1f42e 100644 --- a/doc/EN/apps.org +++ b/doc/EN/apps.org @@ -135,7 +135,7 @@ The black hole for web adverts. Block adverts at the domain name level within yo * PostActiv 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. -[[./app_postactiv.html][How to use it] +[[./app_postactiv.html][How to use it]] * PrivateBin A pastebin where the server has zero knowledge of the content being pasted. From 0f9e185c7770b6fcb94215ff247cc3ccdb023d05 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Wed, 10 Jan 2018 22:25:44 +0000 Subject: [PATCH 15/15] Missing bracket --- website/EN/apps.html | 244 +++++++++++++++++++++---------------------- 1 file changed, 122 insertions(+), 122 deletions(-) diff --git a/website/EN/apps.html b/website/EN/apps.html index 29f18a6b..5eea8214 100644 --- a/website/EN/apps.html +++ b/website/EN/apps.html @@ -3,7 +3,7 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - + ‎ @@ -265,9 +265,9 @@ The base install of the system just contains an email server and Mutt client, bu
-
-

Akaunting

-
+
+

Akaunting

+

A web based accounts system for small businesses or freelancers.

@@ -277,9 +277,9 @@ A web based accounts system for small businesses or freelancers.

-
-

CryptPad

-
+
+

CryptPad

+

Collaborate on editing documents, presentations and source code, or vote on things. All with a good level of security.

@@ -289,9 +289,9 @@ Collaborate on editing documents, presentations and source code, or vote on thin

-
-

DLNA

-
+
+

DLNA

+

Enables you to use the system as a music server which any DLNA compatible devices can connect to within your home network.

@@ -301,9 +301,9 @@ Enables you to use the system as a music server which any DLNA compatible device

-
-

Dokuwiki

-
+
+

Dokuwiki

+

A databaseless wiki system.

@@ -313,9 +313,9 @@ A databaseless wiki system.

-
-

Emacs

-
+
+

Emacs

+

If you use the Mutt client to read your email then this will set it up to use emacs for composing new mail.

@@ -325,9 +325,9 @@ If you use the Mutt client to read your email then this will set it up to use em

-
-

Etherpad

-
+
+

Etherpad

+

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.

@@ -337,9 +337,9 @@ Collaborate on creating documents in real time. Maybe you're planning a holiday

-
-

Federated wiki

-
+
+

Federated wiki

+

A new approach to creating wiki content.

@@ -349,9 +349,9 @@ A new approach to creating wiki content.

-
-

Friendica

-
+
+

Friendica

+

Federated social network system.

@@ -361,9 +361,9 @@ Federated social network system.

-
-

Ghost

-
+
+

Ghost

+

Modern looking blogging system.

@@ -373,9 +373,9 @@ Modern looking blogging system.

-
-

GNU Social

-
+
+

GNU Social

+

Federated social network based on the OStatus protocol. You can "remote follow" other users within the GNU Social federation.

@@ -385,9 +385,9 @@ Federated social network based on the OStatus protocol. You can "remote follo

-
-

Gogs

-
+
+

Gogs

+

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 fork-and-pull workflow. If you can use Github then you can also use Gogs.

@@ -397,9 +397,9 @@ Lightweight git project hosting system. You can mirror projects from Github, or

-
-

HTMLy

-
+
+

HTMLy

+

Databaseless blogging system. Quite simple and with a markdown-like format.

@@ -409,9 +409,9 @@ Databaseless blogging system. Quite simple and with a markdown-like format.

-
-

Hubzilla

-
+
+

Hubzilla

+

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.

@@ -421,9 +421,9 @@ Web publishing platform with social network like features and good privacy contr

-
-

Icecast media stream

-
+
+

Icecast media stream

+

Make your own internet radio station.

@@ -433,9 +433,9 @@ Make your own internet radio station.

-
-

IRC Server (ngirc)

-
+
+

IRC Server (ngirc)

+

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.

@@ -445,18 +445,18 @@ Run your own IRC chat channel which can be secured with a password and accessibl

-
-

Jitsi Meet

-
+
+

Jitsi Meet

+

Experimental WebRTC video conferencing system, similar to Google Hangouts. This may not be fully functional, but is hoped to be in the near future.

-
-

KanBoard

-
+
+

KanBoard

+

A simple kanban system for managing projects or TODO lists.

@@ -466,9 +466,9 @@ A simple kanban system for managing projects or TODO lists.

-
-

Key Server

-
+
+

Key Server

+

An OpenPGP key server for storing and retrieving GPG public keys.

@@ -478,9 +478,9 @@ An OpenPGP key server for storing and retrieving GPG public keys.

-
-

Koel

-
+
+

Koel

+

Access your music collection from any internet connected device.

@@ -490,9 +490,9 @@ Access your music collection from any internet connected device.

-
-

Lychee

-
+
+

Lychee

+

Make your photo albums available on the web.

@@ -502,9 +502,9 @@ Make your photo albums available on the web.

-
-

Mailpile

-
+
+

Mailpile

+

Modern email client which supports GPG encryption.

@@ -514,9 +514,9 @@ Modern email client which supports GPG encryption.

-
-

Matrix

-
+
+

Matrix

+

Multi-user chat with some security and moderation controls.

@@ -526,9 +526,9 @@ Multi-user chat with some security and moderation controls.

-
-

Mediagoblin

-
+
+

Mediagoblin

+

Publicly host video and audio files so that you don't need to use YouTube/Vimeo/etc.

@@ -538,9 +538,9 @@ Publicly host video and audio files so that you don't need to use YouTube/Vimeo/

-
-

Mumble

-
+
+

Mumble

+

The popular VoIP and text chat system. Say goodbye to old-fashioned telephony conferences with silly dial codes. Also works well on mobile.

@@ -550,9 +550,9 @@ The popular VoIP and text chat system. Say goodbye to old-fashioned telephony co

-
-

NextCloud

-
+
+

NextCloud

+

Store files on your server and sync them with laptops or mobile devices. Includes many plugins including videoconferencing and collaborative document editing.

@@ -562,9 +562,9 @@ Store files on your server and sync them with laptops or mobile devices. Include

-
-

PeerTube

-
+
+

PeerTube

+

Peer-to-peer video hosting. Similar to Mediagoblin, but the P2P aspect better enables the streaming load to be shared across servers.

@@ -574,9 +574,9 @@ Peer-to-peer video hosting. Similar to Mediagoblin, but the P2P aspect better en

-
-

PI-Hole

-
+
+

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.

@@ -586,21 +586,21 @@ The black hole for web adverts. Block adverts at the domain name level within yo

-
-

PostActiv

-
+
+

PostActiv

+

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.

-[[./app_postactiv.html][How to use it] +How to use it

-
-

PrivateBin

-
+
+

PrivateBin

+

A pastebin where the server has zero knowledge of the content being pasted.

@@ -610,9 +610,9 @@ A pastebin where the server has zero knowledge of the content being pasted.

-
-

Profanity

-
+
+

Profanity

+

A shell based XMPP client which you can run on the Freedombone server via ssh.

@@ -622,9 +622,9 @@ A shell based XMPP client which you can run on the Freedombone server via ssh.

-
-

Riot Web

-
+
+

Riot Web

+

A browser based user interface for the Matrix federated communications system, including WebRTC audio and video chat.

@@ -634,9 +634,9 @@ A browser based user interface for the Matrix federated communications system, i

-
-

SearX

-
+
+

SearX

+

A metasearch engine for customised and private web searches.

@@ -646,9 +646,9 @@ A metasearch engine for customised and private web searches.

-
-

tt-rss

-
+
+

tt-rss

+

Private RSS reader. Pulls in RSS/Atom feeds via Tor and is only accessible via an onion address. Have "the right to read" 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.

@@ -658,9 +658,9 @@ Private RSS reader. Pulls in RSS/Atom feeds via Tor and is only accessible via a

-
-

Syncthing

-
+
+

Syncthing

+

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.

@@ -670,9 +670,9 @@ Possibly the best way to synchronise files across all of your devices. Once it h

-
-

Tahoe-LAFS

-
+
+

Tahoe-LAFS

+

Robust and encrypted storage of files on one or more server.

@@ -682,9 +682,9 @@ Robust and encrypted storage of files on one or more server.

-
-

Tox

-
+
+

Tox

+

Client and bootstrap node for the Tox chat/VoIP system.

@@ -694,9 +694,9 @@ Client and bootstrap node for the Tox chat/VoIP system.

-
-

Turtl

-
+
+

Turtl

+

A system for privately creating and sharing notes and images, similar to Evernote but without the spying.

@@ -706,18 +706,18 @@ A system for privately creating and sharing notes and images, similar to Evernot

-
-

Vim

-
+
+

Vim

+

If you use the Mutt client to read your email then this will set it up to use vim for composing new mail.

-
-

Virtual Private Network (VPN)

-
+
+

Virtual Private Network (VPN)

+

Set up a VPN on your server so that you can bypass local internet censorship.

@@ -727,9 +727,9 @@ Set up a VPN on your server so that you can bypass local internet censorship.

-
-

XMPP

-
+
+

XMPP

+

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 client state notification to save battery power on your mobile devices, support for seamless roaming between networks and message carbons so that you can receive the same messages while being simultaneously logged in to your account on more than one device.