diff --git a/README.md b/README.md index 85a890e9..b78b1530 100644 --- a/README.md +++ b/README.md @@ -4,11 +4,11 @@ So you want to run your own internet services? Email, chat, VoIP, web sites, fil You can run Freedombone on an old laptop or a single board computer. See the [list of installation methods](https://freedombone.net/installmethods.html). You can also use it to [set up a mesh network](https://freedombone.net/mesh.html) in your local area. -Check out the [list of available apps](https://freedombone.net/apps.html) and [Frequently Asked Questions](https://freedombone.net/faq.html) section. Recent developments are also described on [the blog](https://blog.freedombone.net/tag/freedombone). +Check out the [list of available apps](https://freedombone.net/apps.html) and [Frequently Asked Questions](https://freedombone.net/faq.html) section. Recent developments are also described on [the blog](https://blog.freedombone.net/tag/freedombone). You might also wish to know how to [backup and restore the system](https://freedombone.net/backups.html). Disk images which can be cloned straight to USB or microSD drives are [available here](https://freedombone.net/downloads/v31). -If you find bugs, or want to add a new app to this system see the [Developers Guide](https://freedombone.net/devguide.html) and [Code of Conduct](https://freedombone.net/codeofconduct.html). There is a Matrix chat room available at *#fbone:matrix.freedombone.net* and an XMPP channel at *support@chat.freedombone.net*. +If you find bugs, or want to add a new app to this system see the [Developers Guide](https://freedombone.net/devguide.html) and [Code of Conduct](https://freedombone.net/codeofconduct.html). There is a Matrix chat room available at *#fbone:matrix.freedombone.net* and an XMPP channel at *support@chat.freedombone.net*. The XMPP channel requires membership which you can ask for via [these contact details](https://freedombone.net/support.html). If you like this project and want to support continued development then [here's what to do](https://freedombone.net/support.html). diff --git a/doc/EN/app_syncthing.org b/doc/EN/app_syncthing.org index d2e97ee2..a8532997 100644 --- a/doc/EN/app_syncthing.org +++ b/doc/EN/app_syncthing.org @@ -39,7 +39,7 @@ In another terminal log into Freedombone: ssh username@domainname -p 2222 #+END_SRC -Then select *File Synchronization*. +Then select *Run an App* and *syncthing*. #+attr_html: :width 80% :align center [[file:images/controlpanel/control_panel_file_sync.jpg]] @@ -55,6 +55,9 @@ From the top menu select *Actions* and then *Show ID*, then copy the ID string ( Now wait for a few minutes. Eventually you will see two messages appear within the browser asking if you want to add two new folders from the Freedombone server. Say yes to both, and specify *~/Sync* as the directory with your username and *~/SyncShared* as the shared directory. You can now copy files into your *~/Sync* directory and they will automatically be synced to the server. Those will be files which only you can access. If you copy files into *~/SyncShared* then they will also be available to any other users on the system. +* Desktop app +If you're running Arch/Parabola there is a package called [[https://github.com/syncthing/syncthing-gtk][syncthing-gtk]] which provides a GTK GUI and an icon indicating whether synchronization is happening. This can be more convenient than using the browser interface. + * On Android Install Syncthing and Connectbot from F-droid. diff --git a/doc/EN/app_xmpp.org b/doc/EN/app_xmpp.org index dee57a64..058db2e3 100644 --- a/doc/EN/app_xmpp.org +++ b/doc/EN/app_xmpp.org @@ -71,9 +71,6 @@ Enter your username (username@domainname) and password. Click on *Advanced* and make sure that *Encryption required* and *Ignore SSL certificate errors* are checked. Ignoring the certificate errors will allow you to use the self-signed certificate created earlier. Then click *Done* and set your Jabber account and Empathy to *On*. -* Using Tor Messenger -Tor Messenger is a messaging client which supports XMPP, and its onion routing enables you to protect the metadata of chat interactions to some extent by making it difficult for an adversary to know which server is talking to which. You can download Tor Messenger from [[https://torproject.org][torproject.org]] and the setup is pretty simple. - * Using with Android/Conversations Install [[https://f-droid.org/][F-Droid]] diff --git a/doc/EN/index.org b/doc/EN/index.org index 0254c70e..346715d8 100644 --- a/doc/EN/index.org +++ b/doc/EN/index.org @@ -17,11 +17,11 @@ So you want to run your own internet services? Email, chat, VoIP, web sites, fil You can run Freedombone on an old laptop or a single board computer. See the [[./installmethods.html][list of installation methods]]. You can also use it to [[./mesh.html][set up a mesh network]] in your local area. -Check out the [[./apps.html][list of available apps]] and [[./faq.html][Frequently Asked Questions]] section. Recent developments are also described on [[https://blog.freedombone.net/tag/freedombone][the blog]]. +Check out the [[./apps.html][list of available apps]] and [[./faq.html][Frequently Asked Questions]] section. Recent developments are also described on [[https://blog.freedombone.net/tag/freedombone][the blog]]. You might also wish to know how to [[./backups.html][backup and restore the system]]. Disk images which can be cloned straight to USB or microSD drives are [[./downloads/v31][available here]]. -If you find bugs, or want to add a new app to this system see the [[./devguide.html][Developers Guide]] and [[./codeofconduct.html][Code of Conduct]]. There is a Matrix chat room available at *#fbone:matrix.freedombone.net* and an XMPP channel at *support@chat.freedombone.net*. +If you find bugs, or want to add a new app to this system see the [[./devguide.html][Developers Guide]] and [[./codeofconduct.html][Code of Conduct]]. There is a Matrix chat room available at *#fbone:matrix.freedombone.net* and an XMPP channel at *support@chat.freedombone.net*. The XMPP channel requires membership which you can ask for via [[./support.html][these contact details]]. If you like this project and want to support continued development then [[./support.html][here's what to do]]. diff --git a/doc/EN/support.org b/doc/EN/support.org index 0aa8fa74..06f4652c 100644 --- a/doc/EN/support.org +++ b/doc/EN/support.org @@ -15,13 +15,29 @@ This site can also be accessed via a Tor browser at *http://yjxlc3imv7obva4grjae6u3qw527koaytrgjgdp364hmthrst3jodiid.onion* -*Email:* bob@freedombone.net +*Email/XMPP:* bob@freedombone.net *PGP/GPG Public key:* +#+BEGIN_SRC bash +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mDMEWZBueBYJKwYBBAHaRw8BAQdAKx1t6wL0RTuU6/IBjngMbVJJ3Wg/3UW73/PV +I47xKTS0IUJvYiBNb3R0cmFtIDxib2JAZnJlZWRvbWJvbmUubmV0PoiQBBMWCAA4 +FiEEmruCwAq/OfgmgEh9zCU2GR+nwz8FAlmQbngCGwMFCwkIBwMFFQoJCAsFFgID +AQACHgECF4AACgkQzCU2GR+nwz/9sAD/YgsHnVszHNz1zlVc5EgY1ByDupiJpHj0 +XsLYk3AbNRgBALn45RqgD4eWHpmOriH09H5Rc5V9iN4+OiGUn2AzJ6oHuDgEWZBu +eBIKKwYBBAGXVQEFAQEHQPRBG2ZQJce475S3e0Dxeb0Fz5WdEu2q3GYLo4QG+4Ry +AwEIB4h4BBgWCAAgFiEEmruCwAq/OfgmgEh9zCU2GR+nwz8FAlmQbngCGwwACgkQ +zCU2GR+nwz+OswD+JOoyBku9FzuWoVoOevU2HH+bPOMDgY2OLnST9ZSyHkMBAMcK +fnaZ2Wi050483Sj2RmQRpb99Dod7rVZTDtCqXk0J +=gv5G +-----END PGP PUBLIC KEY BLOCK----- +#+END_SRC + #+attr_html: :width 60% :align center [[file:images/pubkey.png]] -*XMPP channel:* support@chat.freedombone.net +*XMPP channel:* support@chat.freedombone.net (Requires membership. Ask via XMPP to *bob@freedombone.net*) *Matrix:* #fbone:matrix.freedombone.net diff --git a/src/freedombone-app-pleroma b/src/freedombone-app-pleroma index 6b2d3dfd..b9a390de 100755 --- a/src/freedombone-app-pleroma +++ b/src/freedombone-app-pleroma @@ -36,7 +36,7 @@ PLEROMA_CODE= PLEROMA_PORT=4000 PLEROMA_ONION_PORT=8011 PLEROMA_REPO="https://git.pleroma.social/pleroma/pleroma.git" -PLEROMA_COMMIT='1d4bbec6b3239bb83b500a6a90e6686cb682cfac' +PLEROMA_COMMIT='6b9a6838331210dd514d5ecda52783c183bd1bbf' PLEROMA_ADMIN_PASSWORD= PLEROMA_DIR=/etc/pleroma PLEROMA_SECRET_KEY="" diff --git a/src/freedombone-app-syncthing b/src/freedombone-app-syncthing index 1a78be9c..49fd18f0 100755 --- a/src/freedombone-app-syncthing +++ b/src/freedombone-app-syncthing @@ -213,33 +213,26 @@ function run_client_syncthing { SYNCTHING_CONFIG_FILE=~/.syncthingids SYNCTHING_ID=$(cat ~/.syncthing-server-id) + W=(1 $"Show device ID for ${PROJECT_NAME}" + 2 $"Add an ID for another machine or device" + 3 $"Remove an ID for another machine or device" + 4 $"Manually edit device IDs") + while true do - data=$(mktemp 2>/dev/null) - dialog --backtitle $"Freedombone User Control Panel" \ - --title $"File Synchronization" \ - --radiolist $"Choose an operation:" 12 70 6 \ - 1 $"Show device ID for ${PROJECT_NAME}" off \ - 2 $"Add an ID for another machine or device" off \ - 3 $"Remove an ID for another machine or device" off \ - 4 $"Manually edit device IDs" off \ - 5 $"Back to main menu" on 2> "$data" - sel=$? - case $sel in - 1) rm -f "$data" - break;; - 255) rm -f "$data" - break;; - esac - case $(cat "$data") in + # shellcheck disable=SC2068 + selection=$(dialog --backtitle $"Freedombone User Control Panel" --title $"File Synchronization" --menu $"Choose an operation, or ESC for main menu:" 12 70 6 "${W[@]}" 3>&2 2>&1 1>&3) + + if [ ! "$selection" ]; then + break + fi + + case $selection in 1) syncthing_show_id;; 2) syncthing_add_id;; 3) syncthing_remove_id;; 4) syncthing_manual_edit;; - 5) rm -f "$data" - break;; esac - rm -f "$data" done } diff --git a/src/freedombone-controlpanel-user b/src/freedombone-controlpanel-user index f78ee5f2..6ebc59bb 100755 --- a/src/freedombone-controlpanel-user +++ b/src/freedombone-controlpanel-user @@ -812,7 +812,7 @@ function sign_keys { function menu_run_client_app { detect_installable_apps - applist="" + W=() appnames=() n=1 app_index=0 @@ -821,7 +821,7 @@ function menu_run_client_app { do if [[ ${APPS_INSTALLED[$app_index]} != "0" ]]; then if [[ $(function_exists "run_client_${a}") == "1" ]]; then - applist="$applist $n $a off" + W+=("$n" "$a") n=$((n+1)) appnames+=("$a") fi @@ -831,24 +831,17 @@ function menu_run_client_app { if [ $n -le 1 ]; then return fi - backstr=$'Exit' - applist="$applist $n $backstr on" - appnames+=("Exit") # shellcheck disable=SC2086 - choice=$(dialog --stdout --backtitle $"Freedombone" \ - --title $"Run an App" \ - --radiolist $'Choose:' \ - 16 40 20 $applist) + selection=$(dialog --backtitle $"Freedombone" --title $"Run an App" --menu $"Choose an operation, or ESC for main menu:" 16 70 20 "${W[@]}" 3>&2 2>&1 1>&3) - # shellcheck disable=SC2181 - if [ $? -eq 0 ]; then - app_index=$((choice-1)) - chosen_app=${appnames[$app_index]} - if [[ $chosen_app != "Exit" ]]; then - "run_client_${chosen_app}" - fi + if [ ! "$selection" ]; then + return fi + + app_index=$((selection-1)) + chosen_app=${appnames[$app_index]} + "run_client_${chosen_app}" } function show_your_email_address { diff --git a/website/EN/app_syncthing.html b/website/EN/app_syncthing.html index 5d477593..b26b50ce 100644 --- a/website/EN/app_syncthing.html +++ b/website/EN/app_syncthing.html @@ -4,7 +4,7 @@ - + @@ -205,7 +205,7 @@ In another terminal log into Freedombone:

-Then select File Synchronization. +Then select Run an App and syncthing.

@@ -239,9 +239,18 @@ Now wait for a few minutes. Eventually you will see two messages appear within t
-

On Android

+

Desktop app

+If you're running Arch/Parabola there is a package called syncthing-gtk which provides a GTK GUI and an icon indicating whether synchronization is happening. This can be more convenient than using the browser interface. +

+
+
+ +
+

On Android

+
+

Install Syncthing and Connectbot from F-droid.

diff --git a/website/EN/app_xmpp.html b/website/EN/app_xmpp.html index 4f5a5c6f..bc659183 100644 --- a/website/EN/app_xmpp.html +++ b/website/EN/app_xmpp.html @@ -4,7 +4,7 @@ - + @@ -279,18 +279,9 @@ Click on Advanced and make sure that Encryption required and Ig
-

Using Tor Messenger

+

Using with Android/Conversations

-Tor Messenger is a messaging client which supports XMPP, and its onion routing enables you to protect the metadata of chat interactions to some extent by making it difficult for an adversary to know which server is talking to which. You can download Tor Messenger from torproject.org and the setup is pretty simple. -

-
-
- -
-

Using with Android/Conversations

-
-

Install F-Droid

diff --git a/website/EN/index.html b/website/EN/index.html index 6b562d8c..b9a4a698 100644 --- a/website/EN/index.html +++ b/website/EN/index.html @@ -3,33 +3,26 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - - - -‎ - - - + + + + + - + @@ -189,7 +97,7 @@ @licstart The following is the entire license notice for the JavaScript code in this tag. -Copyright (C) 2012-2017 Free Software Foundation, Inc. +Copyright (C) 2012-2013 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 @@ -236,13 +144,14 @@ for the JavaScript code in this tag.
+

logo.png

-
+

New release 3.1

@@ -257,7 +166,7 @@ You can run Freedombone on an old laptop or a single board computer. See the

-Check out the list of available apps and Frequently Asked Questions section. Recent developments are also described on the blog. +Check out the list of available apps and Frequently Asked Questions section. Recent developments are also described on the blog. You might also wish to know how to backup and restore the system.

@@ -265,7 +174,7 @@ Disk images which can be cloned straight to USB or microSD drives are Developers Guide and Code of Conduct. There is a Matrix chat room available at #fbone:matrix.freedombone.net and an XMPP channel at support@chat.freedombone.net. +If you find bugs, or want to add a new app to this system see the Developers Guide and Code of Conduct. There is a Matrix chat room available at #fbone:matrix.freedombone.net and an XMPP channel at support@chat.freedombone.net. The XMPP channel requires membership which you can ask for via these contact details.

diff --git a/website/EN/support.html b/website/EN/support.html index 1616da5f..c18a68b1 100644 --- a/website/EN/support.html +++ b/website/EN/support.html @@ -3,33 +3,26 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - - - -‎ - - - + + + + + - + @@ -189,7 +97,7 @@ @licstart The following is the entire license notice for the JavaScript code in this tag. -Copyright (C) 2012-2017 Free Software Foundation, Inc. +Copyright (C) 2012-2013 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 @@ -236,30 +144,49 @@ for the JavaScript code in this tag.

+

logo.png

-
-

Support

+
+

Support

-
-

Contact details

-
+
+

Contact details

+

This site can also be accessed via a Tor browser at http://yjxlc3imv7obva4grjae6u3qw527koaytrgjgdp364hmthrst3jodiid.onion

-Email: bob@freedombone.net +Email/XMPP: bob@freedombone.net

PGP/GPG Public key:

+
+ +
-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mDMEWZBueBYJKwYBBAHaRw8BAQdAKx1t6wL0RTuU6/IBjngMbVJJ3Wg/3UW73/PV
+I47xKTS0IUJvYiBNb3R0cmFtIDxib2JAZnJlZWRvbWJvbmUubmV0PoiQBBMWCAA4
+FiEEmruCwAq/OfgmgEh9zCU2GR+nwz8FAlmQbngCGwMFCwkIBwMFFQoJCAsFFgID
+AQACHgECF4AACgkQzCU2GR+nwz/9sAD/YgsHnVszHNz1zlVc5EgY1ByDupiJpHj0
+XsLYk3AbNRgBALn45RqgD4eWHpmOriH09H5Rc5V9iN4+OiGUn2AzJ6oHuDgEWZBu
+eBIKKwYBBAGXVQEFAQEHQPRBG2ZQJce475S3e0Dxeb0Fz5WdEu2q3GYLo4QG+4Ry
+AwEIB4h4BBgWCAAgFiEEmruCwAq/OfgmgEh9zCU2GR+nwz8FAlmQbngCGwwACgkQ
+zCU2GR+nwz+OswD+JOoyBku9FzuWoVoOevU2HH+bPOMDgY2OLnST9ZSyHkMBAMcK
+fnaZ2Wi050483Sj2RmQRpb99Dod7rVZTDtCqXk0J
+=gv5G
+-----END PGP PUBLIC KEY BLOCK-----
+
+
+

pubkey.png @@ -267,7 +194,7 @@ This site can also be accessed via a Tor browser at

-
-

Things which would be nice to have

-
-
-
-

Ideas

-
+
+

Things which would be nice to have

+
+
+

Ideas

+

Know of some fabulous web system which could run on Freedombone, but currently doesn't? Contact the above, and be prepared to make a compelling argument for why it should be included.

-