diff --git a/doc/EN/app_matrix.org b/doc/EN/app_matrix.org index 1b244999..6c414d3d 100644 --- a/doc/EN/app_matrix.org +++ b/doc/EN/app_matrix.org @@ -55,4 +55,4 @@ Destination: 10 0 8448 [yourmatrixsubdomain] You may also want to make another entry with the same settings but replacing *tcp* with *udp*. * Mobile app -If you're using the Riot mobile app to access your Matrix homeserver then you can significantly improve battery performance by going to the settings and changing *Sync request timeout* to 30 seconds and *Delay between two sync requests* to 600 seconds. +If you're using the Riot mobile app to access your Matrix homeserver then you can significantly improve battery performance by going to the *settings* and changing *Sync request timeout* to 30 seconds and *Delay between two sync requests* to 600 seconds. Also turning off *msgs in group chats* will help, since it will avoid getting a notification whenever a group chat event happens, which then wakes up the screen. diff --git a/doc/EN/fediverse.org b/doc/EN/fediverse.org index 6a8a6277..9e95879b 100644 --- a/doc/EN/fediverse.org +++ b/doc/EN/fediverse.org @@ -39,5 +39,5 @@ It may seem like a good idea and it may seem like you're doing a service to the #+BEGIN_CENTER -This site can also be accessed via a Tor browser at http://7ec7btgr6m7c5r3h.onion. This documentation is under the [[https://www.gnu.org/licenses/fdl-1.3.txt][GNU Free Documentation License version 1.3]] +This site can also be accessed via a Tor browser at http://yjxlc3imv7obva4grjae6u3qw527koaytrgjgdp364hmthrst3jodiid.onion. This documentation is under the [[https://www.gnu.org/licenses/fdl-1.3.txt][GNU Free Documentation License version 1.3]] #+END_CENTER diff --git a/doc/EN/homeserver.org b/doc/EN/homeserver.org index 05e1efaa..03ef0dba 100644 --- a/doc/EN/homeserver.org +++ b/doc/EN/homeserver.org @@ -153,5 +153,5 @@ man freedombone-image #+end_src #+BEGIN_CENTER -This site can also be accessed via a Tor browser at http://7ec7btgr6m7c5r3h.onion +This site can also be accessed via a Tor browser at http://yjxlc3imv7obva4grjae6u3qw527koaytrgjgdp364hmthrst3jodiid.onion #+END_CENTER diff --git a/doc/EN/index.org b/doc/EN/index.org index 05677b60..49a0745a 100644 --- a/doc/EN/index.org +++ b/doc/EN/index.org @@ -42,5 +42,5 @@ If you find bugs, or want to add a new app to this system see the [[./devguide.h Ready made disk images which can be copied onto USB or microSD drives are [[./downloads/current][available here]]. #+BEGIN_CENTER -This site can also be accessed via a Tor browser at http://7ec7btgr6m7c5r3h.onion. This documentation is under the [[https://www.gnu.org/licenses/fdl-1.3.txt][GNU Free Documentation License version 1.3]] +This site can also be accessed via a Tor browser at http://yjxlc3imv7obva4grjae6u3qw527koaytrgjgdp364hmthrst3jodiid.onion. This documentation is under the [[https://www.gnu.org/licenses/fdl-1.3.txt][GNU Free Documentation License version 1.3]] #+END_CENTER diff --git a/doc/EN/mesh.org b/doc/EN/mesh.org index c90fdd1f..aab59e7f 100644 --- a/doc/EN/mesh.org +++ b/doc/EN/mesh.org @@ -35,5 +35,5 @@ Systems only need to be within wifi range of each other for the mesh to be creat Like [[https://libremesh.org][LibreMesh]], this system uses a combination of [[https://en.wikipedia.org/wiki/B.A.T.M.A.N.][batman-adv]] on network layer 2 and [[http://bmx6.net][BMX]] on layer 3. Routing protocols [[http://www.olsr.org][OLSR2]] and [[https://www.irif.fr/~jch/software/babel][Babel]] are also selectable. #+BEGIN_CENTER -This site can also be accessed via a Tor browser at http://7ec7btgr6m7c5r3h.onion +This site can also be accessed via a Tor browser at http://yjxlc3imv7obva4grjae6u3qw527koaytrgjgdp364hmthrst3jodiid.onion #+END_CENTER diff --git a/doc/EN/support.org b/doc/EN/support.org index 98c4c099..f476a3df 100644 --- a/doc/EN/support.org +++ b/doc/EN/support.org @@ -18,7 +18,7 @@ * Contact details -This site can also be accessed via a Tor browser at *http://7ec7btgr6m7c5r3h.onion* +This site can also be accessed via a Tor browser at *http://yjxlc3imv7obva4grjae6u3qw527koaytrgjgdp364hmthrst3jodiid.onion* *Email:* bob@freedombone.net diff --git a/drivers/README b/drivers/README deleted file mode 100644 index f8b4a67b..00000000 --- a/drivers/README +++ /dev/null @@ -1,4 +0,0 @@ -Since compiling Atheros drivers for use with a wifi dongle on the Beaglebone Black takes a long time pre-compiled drivers are also available here. These may be extracted into /lib/firmware/ before beginning the main installation via 'freedombone menuconfig'. - -sha256: -7eb9324681f03c7630ed01e490ea447dfbd96c9b5389e45b64e4646d1be16ff1 ath9k_htc_driver_bbb.tar.gz diff --git a/drivers/ath9k_htc_driver_bbb.tar.gz b/drivers/ath9k_htc_driver_bbb.tar.gz deleted file mode 100644 index 8ef576c8..00000000 Binary files a/drivers/ath9k_htc_driver_bbb.tar.gz and /dev/null differ diff --git a/drivers/ath9k_htc_driver_bbb.tar.gz.asc b/drivers/ath9k_htc_driver_bbb.tar.gz.asc deleted file mode 100644 index 65ed2319..00000000 --- a/drivers/ath9k_htc_driver_bbb.tar.gz.asc +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1 - -iQIcBAABCAAGBQJVs+ZQAAoJEARSzHzqmC44O1oP+wfzs0SL/NjJbl3qtw1P3hSu -jpHZ9kqEibpFX1VSvFrLb9qiqHnyoBcfoz04kWQ+6uKKc8MC1cev14FUdtKiLl7h -9fESVSIx8VgzHmDNkcXj+nLKI5KMp/bORZxoFL0hM/JVNUQH09RT1/upLE6k5PxA -BBDF+lD0Ez9VGSa91FP5T+mDWXFtEZMwTajkzRyi+H38lSEsfMvhbWV1c5M+W7kQ -u2xf5Z1BTd5lH6HPN3LKf5sOWaLAUa+jkUXLJiDfULm1ylO3ckj2TMQDlriY1Cib -zvFjQ4l5NVmO4/L3HE2yIDtJpHxRCVExtzZk+iXLh8ep+avV1B0l2bf5ObahaK7q -hIxudj9eeTb6ZyIUH/tUYW8LjTwNMom1vN98mG7MGnaqMHDlSqrZv36M42SM9FMb -nSu6PdeFycqCM3O8h3HDuMrgBLckLRhubGVBpkE7XZXyhs8ahVGi8LwltfuVvWFz -NsPnmqI8vdSZDN/b3SAN/zBb47STGFhNY9tMgdaebS40IbJ5iD5KCRLarKTHyRTS -W10Q/Onno25UWbu/+ZIjfbuwaoboI8CNJRUI4YDhR4Huahh+s1v9kSjuXwMacO7R -+nZEXJkP0HOQUZY9g7OjrVEXHdKUw1Vlw3AyQt7Z4SUNjeEoRP1Bcr7LPBB8Y5pW -sTndAdLqpVzMBymfLGRS -=OOIn ------END PGP SIGNATURE----- diff --git a/drivers/firmware-ath9k-htc.deb b/drivers/firmware-ath9k-htc.deb new file mode 100644 index 00000000..384e3230 Binary files /dev/null and b/drivers/firmware-ath9k-htc.deb differ diff --git a/src/freedombone-app-fedwiki b/src/freedombone-app-fedwiki index 0d0630eb..81d8ea87 100755 --- a/src/freedombone-app-fedwiki +++ b/src/freedombone-app-fedwiki @@ -458,7 +458,7 @@ function install_fedwiki { fi echo '[Unit]' > /etc/systemd/system/fedwiki.service - echo 'Description=Fedwiki Decentralized video streaming platform' >> /etc/systemd/system/fedwiki.service + echo 'Description=Fedwiki federated wiki' >> /etc/systemd/system/fedwiki.service echo 'After=syslog.target' >> /etc/systemd/system/fedwiki.service echo 'After=network.target' >> /etc/systemd/system/fedwiki.service echo '' >> /etc/systemd/system/fedwiki.service @@ -482,7 +482,7 @@ function install_fedwiki { fedwiki_auth_file=${FEDWIKI_DATA}/status/owner.json echo '{' > $fedwiki_auth_file echo " \"name\": \"${MY_USERNAME}\"," >> $fedwiki_auth_file - echo ' \"friend\": {' >> $fedwiki_auth_file + echo ' "friend": {' >> $fedwiki_auth_file echo " \"secret\": \"${FEDWIKI_COOKIE}\"" >> $fedwiki_auth_file echo ' }' >> $fedwiki_auth_file echo '}' >> $fedwiki_auth_file diff --git a/src/freedombone-app-gogs b/src/freedombone-app-gogs index b22e4697..ffe23318 100755 --- a/src/freedombone-app-gogs +++ b/src/freedombone-app-gogs @@ -649,6 +649,7 @@ function install_gogs { fi if ! grep -q "hidden_service_gogs" /etc/tor/torrc; then echo 'HiddenServiceDir /var/lib/tor/hidden_service_gogs/' >> /etc/tor/torrc + echo 'HiddenServiceVersion 3' >> /etc/tor/torrc echo "HiddenServicePort 80 127.0.0.1:${GIT_ONION_PORT}" >> /etc/tor/torrc echo "HiddenServicePort 9418 127.0.0.1:9418" >> /etc/tor/torrc echo $'Added onion site for Gogs' diff --git a/src/freedombone-app-keyserver b/src/freedombone-app-keyserver index e4325b7e..fb53306c 100755 --- a/src/freedombone-app-keyserver +++ b/src/freedombone-app-keyserver @@ -660,6 +660,7 @@ function install_keyserver { if ! grep -q "hidden_service_sks" /etc/tor/torrc; then echo 'HiddenServiceDir /var/lib/tor/hidden_service_sks/' >> /etc/tor/torrc + echo 'HiddenServiceVersion 3' >> /etc/tor/torrc echo "HiddenServicePort 11370 127.0.0.1:11370" >> /etc/tor/torrc echo "HiddenServicePort 11373 127.0.0.1:11371" >> /etc/tor/torrc echo "HiddenServicePort 11372 127.0.0.1:11372" >> /etc/tor/torrc diff --git a/src/freedombone-app-librevault b/src/freedombone-app-librevault deleted file mode 100755 index 59422e07..00000000 --- a/src/freedombone-app-librevault +++ /dev/null @@ -1,321 +0,0 @@ -#!/bin/bash -# -# .---. . . -# | | | -# |--- .--. .-. .-. .-.| .-. .--.--. |.-. .-. .--. .-. -# | | (.-' (.-' ( | ( )| | | | )( )| | (.-' -# ' ' --' --' -' - -' ' ' -' -' -' ' - --' -# -# Freedom in the Cloud -# -# Librevault application -# -# License -# ======= -# -# Copyright (C) 2014-2016 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='' - -IN_DEFAULT_INSTALL=0 -SHOW_ON_ABOUT=0 - -PROTOBUF_REPO="https://github.com/google/protobuf" -PROTOBUF_COMMIT='b97a4a53cdd55be74c30badefeb132a091764f53' - -LIBREVAULT_REPO="https://github.com/Librevault/librevault" -LIBREVAULT_COMMIT='86a6aefcb5cc458f4d42195368fbcff2871f98e3' -LIBREVAULT_PORT=42345 - -librevault_variables=(PROTOBUF_REPO - LIBREVAULT_REPO - LIBREVAULT_PORT) - -function logging_on_librevault { - echo -n '' -} - -function logging_off_librevault { - echo -n '' -} - -function install_interactive_librevault { - echo -n '' - APP_INSTALLED=1 -} - -function reconfigure_librevault { - echo -n '' - # TODO -} - -function upgrade_librevault { - CURR_LIBREVAULT_COMMIT=$(get_completion_param "librevault commit") - if [[ "$CURR_LIBREVAULT_COMMIT" == "$LIBREVAULT_COMMIT" ]]; then - return - fi - - function_check set_repo_commit - - if [ -d $INSTALL_DIR/protobuf ]; then - if ! grep -q "Protobuf commit:$PROTOBUF_COMMIT" $COMPLETION_FILE; then - set_repo_commit $INSTALL_DIR/protobuf "Protobuf commit" "$PROTOBUF_COMMIT" $PROTOBUF_REPO - cd $INSTALL_DIR/protobuf - ./autogen.sh - ./configure - make - make check - make install - ldconfig - fi - fi - - if [ -d $INSTALL_DIR/librevault/build ]; then - if ! grep -q "librevault commit:$LIBREVAULT_COMMIT" $COMPLETION_FILE; then - set_repo_commit $INSTALL_DIR/librevault "librevault commit" "$LIBREVAULT_COMMIT" $LIBREVAULT_REPO - cd $INSTALL_DIR/librevault - git submodule update --init --recursive - cd $INSTALL_DIR/librevault/build - cmake .. - cmake --build . - make install - fi - fi -} - -function backup_local_librevault { - echo -n '' - # TODO -} - -function restore_local_librevault { - echo -n '' - # TODO -} - -function backup_remote_librevault { - echo -n '' - # TODO -} - -function restore_remote_librevault { - echo -n '' - # TODO -} - -function remove_librevault { - firewall_remove ${LIBREVAULT_PORT} - systemctl stop librevault - systemctl disable librevault - rm /etc/systemd/system/librevault.service - systemctl daemon-reload - remove_completion_param install_librevault - remove_completion_param configure_firewall_for_librevault -} - -function configure_firewall_for_librevault { - if [[ $(is_completed $FUNCNAME) == "1" ]]; then - return - fi - firewall_add Librevault ${LIBREVAULT_PORT} - mark_completed $FUNCNAME -} - -function mesh_install_librevault { - install_tracker - install_cmake - install_cryptopp - - chroot "$rootdir" apt-get -yq install bittornado nginx - chroot "$rootdir" apt-get -yq install build-essential - chroot "$rootdir" apt-get -yq install autoconf automake libtool curl make unzip - - # A workaround which allows c++14 to be installed - chroot "$rootdir" apt-get -yq install g++ gcc-6 g++-6 libboost-all-dev libssl-dev - chroot "$rootdir" apt-get -yq install protobuf-compiler libprotobuf-dev - chroot "$rootdir" apt-get -yq install qtbase5-dev libqt5svg5-dev libqt5websockets5-dev - chroot "$rootdir" apt-get -yq install libsqlite3-dev qttools5-dev qttools5-dev-tools libnatpmp-dev - - if [ ! -d $rootdir$INSTALL_DIR ]; then - mkdir -p $rootdir$INSTALL_DIR - fi - - git clone $PROTOBUF_REPO $rootdir$INSTALL_DIR/protobuf - cd $rootdir$INSTALL_DIR/protobuf - git checkout $PROTOBUF_COMMIT -b $PROTOBUF_COMMIT - - cat < $rootdir/root/install_protobuf -cd $INSTALL_DIR/protobuf -./autogen.sh -./configure -make -make install -ldconfig -EOF - chroot "$rootdir" chmod +x /root/install_protobuf - chroot "$rootdir" /root/install_protobuf - - git clone $LIBREVAULT_REPO $rootdir$INSTALL_DIR/librevault - cd $rootdir$INSTALL_DIR/librevault - git checkout $LIBREVAULT_COMMIT -b $LIBREVAULT_COMMIT - git submodule update --init --recursive - - # rabin seems particularly broken - rm -rf $rootdir$INSTALL_DIR/librevault/contrib/rabin - git clone https://github.com/bashrc/rabin $rootdir$INSTALL_DIR/librevault/contrib/rabin - cd $rootdir$INSTALL_DIR/librevault/contrib/rabin - git checkout bashrc/fixup2 - - mkdir $rootdir$INSTALL_DIR/librevault/build - - cat < $rootdir/root/install_librevault -cd $INSTALL_DIR/librevault/build -cmake -BUILD_UPDATER=OFF .. -which Meta_s.pb.cc -cmake --build $INSTALL_DIR/librevault/build -make install -EOF - chroot "$rootdir" chmod +x /root/install_librevault - chroot "$rootdir" /root/install_librevault - chroot "$rootdir" rm /root/install_librevault - - LIBREVAULT_DAEMON=$rootdir/etc/systemd/system/librevault-daemon.service - echo '[Unit]' > $LIBREVAULT_DAEMON - echo 'Description=Librevault - Peer-to-peer, decentralized and open source file sync (multi-instance-master)' >> $LIBREVAULT_DAEMON - echo '' >> $LIBREVAULT_DAEMON - echo '[Service]' >> $LIBREVAULT_DAEMON - echo 'Type=oneshot' >> $LIBREVAULT_DAEMON - echo 'RemainAfterExit=yes' >> $LIBREVAULT_DAEMON - echo 'ExecStart=/bin/true' >> $LIBREVAULT_DAEMON - echo 'ExecReload=/bin/true' >> $LIBREVAULT_DAEMON - echo '' >> $LIBREVAULT_DAEMON - echo '[Install]' >> $LIBREVAULT_DAEMON - echo 'WantedBy=multi-user.target' >> $LIBREVAULT_DAEMON - - LIBREVAULT_DAEMON=$rootdir/etc/systemd/system/librevault-daemon@.service - echo '[Unit]' > $LIBREVAULT_DAEMON - echo 'Description=Librevault - Peer-to-peer, decentralized and open source file sync (instance for %I)' >> $LIBREVAULT_DAEMON - echo 'After=network.target' >> $LIBREVAULT_DAEMON - echo 'PartOf=librevault-daemon.service' >> $LIBREVAULT_DAEMON - echo 'ReloadPropagatedFrom=librevault-daemon.service' >> $LIBREVAULT_DAEMON - echo '' >> $LIBREVAULT_DAEMON - echo '[Service]' >> $LIBREVAULT_DAEMON - echo 'User=%i' >> $LIBREVAULT_DAEMON - echo 'ExecStart=/usr/bin/librevault-daemon' >> $LIBREVAULT_DAEMON - echo 'Restart=on-failure' >> $LIBREVAULT_DAEMON - echo '' >> $LIBREVAULT_DAEMON - echo '[Install]' >> $LIBREVAULT_DAEMON - echo 'WantedBy=multi-user.target' >> $LIBREVAULT_DAEMON - - chroot "$rootdir" systemctl enable librevault-daemon -} - -function install_librevault { - if [ $INSTALLING_MESH ]; then - mesh_install_librevault - return - fi - - install_tracker - install_cmake - install_cryptopp - - apt-get -yq install build-essential - apt-get -yq install autoconf automake libtool curl make unzip - - # A workaround which allows c++14 to be installed - apt-get -yq install protobuf-compiler libprotobuf-dev - apt-get -yq install g++ gcc-6 g++-6 libboost-all-dev libssl-dev - apt-get -yq install qtbase5-dev libqt5svg5-dev libqt5websockets5-dev - apt-get -yq install libsqlite3-dev qttools5-dev qttools5-dev-tools libnatpmp-dev - apt-get -yq install gcc-6 g++-6 libboost-all-dev - - if [ ! -d $INSTALL_DIR ]; then - mkdir -p $INSTALL_DIR - fi - git_clone $PROTOBUF_REPO $INSTALL_DIR/protobuf - cd $INSTALL_DIR/protobuf - git checkout $PROTOBUF_COMMIT -b $PROTOBUF_COMMIT - ./autogen.sh - ./configure - make - make check - make install - ldconfig - - set_completion_param "Protobuf commit" "$PROTOBUF_COMMIT" - - if [ -d /repos/librevault ]; then - mkdir $INSTALL_DIR/librevault - cp -r -p /repos/librevault/. $INSTALL_DIR/librevault - cd $INSTALL_DIR/librevault - git pull - else - git_clone $LIBREVAULT_REPO $INSTALL_DIR/librevault - fi - - cd $INSTALL_DIR/librevault - git checkout $LIBREVAULT_COMMIT -b $LIBREVAULT_COMMIT - git submodule update --init --recursive - - # rabin seems particularly broken - rm -rf $INSTALL_DIR/librevault/contrib/rabin - git clone https://github.com/bashrc/rabin $INSTALL_DIR/librevault/contrib/rabin - cd $INSTALL_DIR/librevault/contrib/rabin - git checkout bashrc/fixup2 - - mkdir $INSTALL_DIR/librevault/build - cd $INSTALL_DIR/librevault/build - cmake -BUILD_UPDATER=OFF .. - cmake --build . - make install - - set_completion_param "librevault commit" "$LIBREVAULT_COMMIT" - - LIBREVAULT_DAEMON=/etc/systemd/system/librevault-daemon.service - echo '[Unit]' > $LIBREVAULT_DAEMON - echo 'Description=Librevault - Peer-to-peer, decentralized and open source file sync (multi-instance-master)' >> $LIBREVAULT_DAEMON - echo '' >> $LIBREVAULT_DAEMON - echo '[Service]' >> $LIBREVAULT_DAEMON - echo 'Type=oneshot' >> $LIBREVAULT_DAEMON - echo 'RemainAfterExit=yes' >> $LIBREVAULT_DAEMON - echo 'ExecStart=/bin/true' >> $LIBREVAULT_DAEMON - echo 'ExecReload=/bin/true' >> $LIBREVAULT_DAEMON - echo '' >> $LIBREVAULT_DAEMON - echo '[Install]' >> $LIBREVAULT_DAEMON - echo 'WantedBy=multi-user.target' >> $LIBREVAULT_DAEMON - - LIBREVAULT_DAEMON=/etc/systemd/system/librevault-daemon@.service - echo '[Unit]' > $LIBREVAULT_DAEMON - echo 'Description=Librevault - Peer-to-peer, decentralized and open source file sync (instance for %I)' >> $LIBREVAULT_DAEMON - echo 'After=network.target' >> $LIBREVAULT_DAEMON - echo 'PartOf=librevault-daemon.service' >> $LIBREVAULT_DAEMON - echo 'ReloadPropagatedFrom=librevault-daemon.service' >> $LIBREVAULT_DAEMON - echo '' >> $LIBREVAULT_DAEMON - echo '[Service]' >> $LIBREVAULT_DAEMON - echo 'User=%i' >> $LIBREVAULT_DAEMON - echo 'ExecStart=/usr/bin/librevault-daemon' >> $LIBREVAULT_DAEMON - echo 'Restart=on-failure' >> $LIBREVAULT_DAEMON - echo '' >> $LIBREVAULT_DAEMON - echo '[Install]' >> $LIBREVAULT_DAEMON - echo 'WantedBy=multi-user.target' >> $LIBREVAULT_DAEMON - - systemctl enable librevault-daemon - systemctl start librevault-daemon - APP_INSTALLED=1 -} - -# NOTE: deliberately no exit 0 diff --git a/src/freedombone-app-rss b/src/freedombone-app-rss index 30386b91..4639c71b 100755 --- a/src/freedombone-app-rss +++ b/src/freedombone-app-rss @@ -394,8 +394,6 @@ function install_rss_main { RSS_MOBILE_READER_ONION_HOSTNAME=$(add_onion_service mobilerss 80 ${RSS_MOBILE_READER_ONION_PORT}) - set_completion_param "rss_mobile onion domain" "$RSS_MOBILE_READER_ONION_HOSTNAME" - echo 'server {' > /etc/nginx/sites-available/$RSS_READER_DOMAIN_NAME echo " listen 127.0.0.1:$RSS_MOBILE_READER_ONION_PORT;" >> /etc/nginx/sites-available/$RSS_READER_DOMAIN_NAME echo " server_name $RSS_MOBILE_READER_ONION_HOSTNAME;" >> /etc/nginx/sites-available/$RSS_READER_DOMAIN_NAME diff --git a/src/freedombone-app-xmpp b/src/freedombone-app-xmpp index 0a853c4d..8ced2f1a 100755 --- a/src/freedombone-app-xmpp +++ b/src/freedombone-app-xmpp @@ -586,6 +586,7 @@ function remove_xmpp { function_check remove_onion_service remove_onion_service xmpp 5222 5223 5269 + sed -i '/HiddenServiceVersion 2/d' /etc/tor/torrc apt-get -yq remove --purge prosody rm /etc/cron.daily/prosody @@ -1029,6 +1030,7 @@ function install_xmpp { fi if ! grep -q "hidden_service_xmpp" /etc/tor/torrc; then echo 'HiddenServiceDir /var/lib/tor/hidden_service_xmpp/' >> /etc/tor/torrc + echo 'HiddenServiceVersion 2' >> /etc/tor/torrc echo "HiddenServicePort 5222 127.0.0.1:5222" >> /etc/tor/torrc echo "HiddenServicePort 5269 127.0.0.1:5269" >> /etc/tor/torrc echo $'Added onion site for xmpp chat' diff --git a/src/freedombone-controlpanel b/src/freedombone-controlpanel index 97ed03b4..f6a616b2 100755 --- a/src/freedombone-controlpanel +++ b/src/freedombone-controlpanel @@ -437,7 +437,7 @@ function show_domains { echo -n -e "$(pad_string "${icann_address}")" echo "${onion_address}" - if grep -q "${app_name}_mobile onion domain" $COMPLETION_FILE; then + if grep -q "mobile${app_name} onion domain" $COMPLETION_FILE; then onion_address=$(get_app_onion_address "${app_name}" "mobile") echo -n -e "$(pad_string "${app_name} (mobile)")" echo -n -e "$(pad_string "${icann_address}")" @@ -454,11 +454,11 @@ function show_domains { echo -n "$(cat /var/lib/tor/hidden_service_ttrss/hostname)" echo '' fi - if [ -d /var/lib/tor/hidden_service_ttrss_mobile ]; then + if [ -d /var/lib/tor/hidden_service_mobilerss ]; then echo -n -e "$(pad_string 'RSS mobile')" RSSMOBILEDOM='-' echo -n -e "$(pad_string ${RSSMOBILEDOM})" - echo -n "$(cat /var/lib/tor/hidden_service_ttrss_mobile/hostname)" + echo -n "$(cat /var/lib/tor/hidden_service_mobilerss/hostname)" echo '' fi fi diff --git a/src/freedombone-image-customise b/src/freedombone-image-customise index 7e9410b3..71c1e02c 100755 --- a/src/freedombone-image-customise +++ b/src/freedombone-image-customise @@ -496,18 +496,8 @@ atheros_wifi() { return fi - firmware_filename="open-ath9k-htc-firmware_1.3-1_all.deb" - firmware_hash='5fea58ffefdf0ef15b504db7fbe3bc078c03e0d927bba64085e4b6f2546102f5' - - firmware_url="http://us.archive.trisquel.info/trisquel/pool/main/o/open-ath9k-htc-firmware/$firmware_filename" - firmware_tempfile="/tmp/$firmware_filename" - wget "$firmware_url" -O "$rootdir$firmware_tempfile" - downloaded_firmware_hash=$(sha256sum "$rootdir$firmware_tempfile" | awk -F ' ' '{print $1}') - if [[ "$downloaded_firmware_hash" == "$firmware_hash" ]]; then - chroot "$rootdir" dpkg -i "$firmware_tempfile" - else - echo 'WARNING: Atheros Wifi firmware hash does not match. The driver has not been installed.' - fi + chroot "$rootdir" dpkg -i /root/freedombone/drivers/firmware-ath9k-htc.deb + chroot "$rootdir" apt-get -yq install firmware-linux-free } configure_wifi() { @@ -1743,8 +1733,8 @@ function image_setup_utils { chroot "$rootdir" connect-proxy sed -i 's|#Log notice file.*|Log notice file /dev/null|g' $rootdir/etc/tor/torrc sed -i 's|Log notice file.*|Log notice file /dev/null|g' $rootdir/etc/tor/torrc - sed -i "s|#AccountingMax.*|AccountingMax $TOR_MAX_TRAFFIC_PER_DAY_GB GBytes|g" $rootdir/etc/tor/torrc - sed -i "s|AccountingMax.*|AccountingMax $TOR_MAX_TRAFFIC_PER_DAY_GB GBytes|g" $rootdir/etc/tor/torrc + sed -i "s|#AccountingMax.*|AccountingMax $TOR_MAX_TRAFFIC_PER_MONTH_GB GBytes|g" $rootdir/etc/tor/torrc + sed -i "s|AccountingMax.*|AccountingMax $TOR_MAX_TRAFFIC_PER_MONTH_GB GBytes|g" $rootdir/etc/tor/torrc if ! grep -q 'Host *.onion' $rootdir/root/.ssh/config; then if [ ! -d $rootdir/root/.ssh ]; then mkdir $rootdir/root/.ssh diff --git a/src/freedombone-utils-onion b/src/freedombone-utils-onion index 83d5338d..0bd4953b 100755 --- a/src/freedombone-utils-onion +++ b/src/freedombone-utils-onion @@ -29,7 +29,7 @@ # along with this program. If not, see . # The maximum amount of traffic per day in gigabytes -TOR_MAX_TRAFFIC_PER_DAY_GB=3 +TOR_MAX_TRAFFIC_PER_MONTH_GB=10 HIDDEN_SERVICE_PATH='/var/lib/tor/hidden_service_' @@ -124,7 +124,7 @@ function add_onion_service { fi if ! grep -q "hidden_service_${onion_service_name}" /etc/tor/torrc; then echo "HiddenServiceDir ${HIDDEN_SERVICE_PATH}${onion_service_name}/" >> /etc/tor/torrc - #echo 'HiddenServiceVersion 3' >> /etc/tor/torrc + echo 'HiddenServiceVersion 3' >> /etc/tor/torrc echo "HiddenServicePort ${onion_service_port_from} 127.0.0.1:${onion_service_port_to}" >> /etc/tor/torrc if [ ${#onion_stealth_name} -gt 0 ]; then echo "HiddenServiceAuthorizeClient stealth ${onion_stealth_name}" >> /etc/tor/torrc @@ -284,8 +284,8 @@ function install_tor { sed -i 's|Log notice file.*|Log notice file /dev/null|g' /etc/tor/torrc # Restrict traffic - sed -i "s|#AccountingMax.*|AccountingMax $TOR_MAX_TRAFFIC_PER_DAY_GB GBytes|g" /etc/tor/torrc - sed -i "s|AccountingMax.*|AccountingMax $TOR_MAX_TRAFFIC_PER_DAY_GB GBytes|g" /etc/tor/torrc + sed -i "s|#AccountingMax.*|AccountingMax $TOR_MAX_TRAFFIC_PER_MONTH_GB GBytes|g" /etc/tor/torrc + sed -i "s|AccountingMax.*|AccountingMax $TOR_MAX_TRAFFIC_PER_MONTH_GB GBytes|g" /etc/tor/torrc mark_completed $FUNCNAME } @@ -427,11 +427,11 @@ function get_app_onion_address { mobilestr="$2" if [ ${#mobilestr} -gt 0 ]; then - mobilestr="_${mobilestr}" + app_name="mobile${app_name}" fi - if grep -q "${app_name}${mobilestr} onion domain" $COMPLETION_FILE; then - if grep -q "${app_name}${mobilestr} onion domain" $COMPLETION_FILE; then - echo $(cat ${COMPLETION_FILE} | grep "${app_name}${mobilestr} onion domain" | head -n 1 | awk -F ':' '{print $2}') + if grep -q "${app_name} onion domain" $COMPLETION_FILE; then + if grep -q "${app_name} onion domain" $COMPLETION_FILE; then + echo $(cat ${COMPLETION_FILE} | grep "${app_name} onion domain" | head -n 1 | awk -F ':' '{print $2}') return fi fi diff --git a/src/freedombone-utils-wifi b/src/freedombone-utils-wifi index ea71c609..1ecdf813 100755 --- a/src/freedombone-utils-wifi +++ b/src/freedombone-utils-wifi @@ -13,7 +13,7 @@ # License # ======= # -# Copyright (C) 2015-2016 Bob Mottram +# Copyright (C) 2015-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 @@ -86,7 +86,9 @@ function setup_wifi_atheros { return fi - atheros_drivers_file=drivers/ath9k_htc_driver_bbb.tar.gz + apt-get -yq install firmware-linux-free + + atheros_drivers_file=drivers/firmware-ath9k-htc.deb if [ ! -f $atheros_drivers_file ]; then if [ ! -f ~/freedombone/$atheros_drivers_file ]; then return @@ -96,20 +98,8 @@ function setup_wifi_atheros { else atheros_drivers_file=$(pwd)/$atheros_drivers_file fi - if [ ! -d /lib/firmware ]; then - mkdir /lib/firmware - if [ ! -d /lib/firmware ]; then - return - fi - fi - if [ -f /lib/firmware/htc_9271.fw ]; then - return - fi - curr_dir=$(pwd) - cd /lib/firmware - tar -xzvf $atheros_drivers_file + dpkg -i $atheros_drivers_file reset_usb_devices - cd $curr_dir update_wifi_adaptors if [ $IFACE ]; then wpa_action ${IFACE} stop diff --git a/website/EN/app_matrix.html b/website/EN/app_matrix.html index 04e20896..b1a35c4e 100644 --- a/website/EN/app_matrix.html +++ b/website/EN/app_matrix.html @@ -3,7 +3,7 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - + ‎ @@ -264,9 +264,9 @@ Matrix is a federated communications system, typically for multi-user chat, with Another consideration is that since matrix operates on the usual HTTPS port number (443) this may make it difficult for ISPs or governments to censor this type of communications via port blocking without significant blowback.

-
-

Installation

-
+
+

Installation

+

Log into your system with:

@@ -286,9 +286,9 @@ Select Add/Remove Apps then matrix. You will then be asked for a d
-
-

Initial setup

-
+
+

Initial setup

+

Go to the Administrator control panel and select Passwords then matrix. This will give you the password to initially log in to the system and you can change it later from a client app if needed.

@@ -303,9 +303,9 @@ Other client apps are available but are currently mostly only at the alpha stage
-
-

DNS setup

-
+
+

DNS setup

+

It's recommended that you add an SRV record for Matrix to your DNS setup. How you do this will depend upon your dynamic DNS provider and their web interface. On FreeDNS on the subdomains settings in addition to the subdomain which you are using for the matrix server create an extra entry as follows:

@@ -324,11 +324,11 @@ You may also want to make another entry with the same settings but replacing
-
-

Mobile app

-
+
+

Mobile app

+

-If you're using the Riot mobile app to access your Matrix homeserver then you can significantly improve battery performance by going to the settings and changing Sync request timeout to 30 seconds and Delay between two sync requests to 600 seconds. +If you're using the Riot mobile app to access your Matrix homeserver then you can significantly improve battery performance by going to the settings and changing Sync request timeout to 30 seconds and Delay between two sync requests to 600 seconds. Also turning off msgs in group chats will help, since it will avoid getting a notification whenever a group chat event happens, which then wakes up the screen.

diff --git a/website/EN/fediverse.html b/website/EN/fediverse.html index 4245fcd9..83a5e865 100644 --- a/website/EN/fediverse.html +++ b/website/EN/fediverse.html @@ -3,7 +3,7 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - + ‎ @@ -252,54 +252,54 @@ for the JavaScript code in this tag. Some things you might want to know about the Fediverse:

-
-

Keep the number of users on each server small

-
+
+

Keep the number of users on each server small

+

The importance of this can't be overstated. Servers with lots of users always eventually have problems where the interests of the users are not the same as the interests of the server administrator. If you are the server administrator, or if there are only a small squad-size group of people on the server, then it's a lot easier to resolve differences and everyone's interests are likely to be similar.

-
-

Drama will happen

-
+
+

Drama will happen

+

It's inevitable in any social network, but fortunately your options for dealing with it are better than they are in the giant proprietary monoliths. In the proprietary world Google or Facebook don't give a damn about the fate of individual users. On a server with a small number of users if you're getting griefed then the administrator is likely to care and be able to do something about it.

-
-

Don't be afraid to block

-
+
+

Don't be afraid to block

+

Especially if other servers are publishing content which may not be legal in your jurisdiction then don't be afraid to use domain or user blocking from the Administrator control panel. The same applies if users on other servers are trying to harass you. Blocking creates politics and drama but this is a feature not a bug. It allows you to craft your own distinct community and user experience while also existing in the wider federation. It's hard to do this on sites like Twitter or Facebook. Try to keep blocking to a minimum though and avoid doing it for insubstantial reasons. If you have other users on your server then publish the blocked domains list somewhere they can see. That avoids disappointment and enables you to have a discussion about the validity of blocking decisions.

-
-

Network structure maps on to social structure

-
+
+

Network structure maps on to social structure

+

Over time follows and blocking rules come to match the underlying social geography of affinity groups. Blocking will happen and users will move around or start new servers. Drama related to blocking will dissipate.

-
-

Keep your follows under the Dunbar number

-
+
+

Keep your follows under the Dunbar number

+

Keep the number of other users you're following and who are also active to under a couple of hundred. Any more than that and you'll just be overwhelmed by irrelevant stuff and whatever community you may have been part of will dissolve in a sea of entropy. There are no algorithmic timelines, and even if they're introduced then they create their own problems as an opaque form of censorship. Real community happens at tribal scale. It's something which people often don't like to admit because they get fixated upon bigger and bigger numbers, but it definitely seems to be true.

-
-

Avoid big public servers

-
+
+

Avoid big public servers

+

It may seem like a good idea and it may seem like you're doing a service to the community by allowing random strangers to register, but servers with thousands of users only cause problems - social, administrative, financial and possibly also legal. The financial strain of running a powerful server with high reliability may be enough to encourage the administrator to begin pushing advertising onto the system, or sell user content, and then before you know it you have identical problems to Twitter. Instead try to encourage people to set up their own servers. Follow this principle and a lot of arguments and stress will be more easily avoided.

@@ -308,7 +308,7 @@ It may seem like a good idea and it may seem like you're doing a service to the

-This site can also be accessed via a Tor browser at http://7ec7btgr6m7c5r3h.onion. This documentation is under the GNU Free Documentation License version 1.3 +This site can also be accessed via a Tor browser at http://yjxlc3imv7obva4grjae6u3qw527koaytrgjgdp364hmthrst3jodiid.onion. This documentation is under the GNU Free Documentation License version 1.3

diff --git a/website/EN/homeserver.html b/website/EN/homeserver.html index c23e21ca..42475f8a 100644 --- a/website/EN/homeserver.html +++ b/website/EN/homeserver.html @@ -3,7 +3,7 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - + ‎ @@ -478,7 +478,7 @@ Of course, this is just one way in which you can install the Freedombone system.

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

diff --git a/website/EN/index.html b/website/EN/index.html index 0ccd9e0a..65dd3bcb 100644 --- a/website/EN/index.html +++ b/website/EN/index.html @@ -3,7 +3,7 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - + ‎ @@ -299,7 +299,7 @@ Ready made disk images which can be copied onto USB or microSD drives are

-This site can also be accessed via a Tor browser at http://7ec7btgr6m7c5r3h.onion. This documentation is under the GNU Free Documentation License version 1.3 +This site can also be accessed via a Tor browser at http://yjxlc3imv7obva4grjae6u3qw527koaytrgjgdp364hmthrst3jodiid.onion. This documentation is under the GNU Free Documentation License version 1.3

diff --git a/website/EN/mesh.html b/website/EN/mesh.html index d285f24e..dd0cf430 100644 --- a/website/EN/mesh.html +++ b/website/EN/mesh.html @@ -3,7 +3,7 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - + ‎ @@ -284,7 +284,7 @@ Like LibreMesh, this system uses a combinati

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

diff --git a/website/EN/support.html b/website/EN/support.html index 3f6f385a..cf2cd184 100644 --- a/website/EN/support.html +++ b/website/EN/support.html @@ -3,7 +3,7 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - + ‎ @@ -248,11 +248,11 @@ for the JavaScript code in this tag.

Support

-
-

Contact details

-
+
+

Contact details

+

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

@@ -273,22 +273,22 @@ This site can also be accessed via a Tor browser at -

Things which would be nice to have

-
+