free
/
freedomboneeee
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

This commit is contained in:
Bob Mottram 2018-05-13 12:01:59 +01:00
parent 8dd130839e 800ec2febc
commit 00244a05db
8 changed files with 76 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -8,7 +8,7 @@ Check out the [list of available apps](https://freedombone.net/apps.html) and [F
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*.
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 like this project and want to support continued development then [here's what to do](https://freedombone.net/support.html).

2
doc/EN/index.org
View File

@ -21,7 +21,7 @@ Check out the [[./apps.html][list of available apps]] and [[./faq.html][Frequent
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*.
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 like this project and want to support continued development then [[./support.html][here's what to do]].

2
doc/EN/support.org
View File

@ -21,7 +21,7 @@ This site can also be accessed via a Tor browser at *http://yjxlc3imv7obva4grjae
#+attr_html: :width 60% :align center
[[file:images/pubkey.png]]
*XMPP:* bob@freedombone.net with OMEMO or OpenPGP
*XMPP channel:* support@chat.freedombone.net
*Matrix:* #fbone:matrix.freedombone.net

11
src/freedombone-upgrade
View File

@ -61,6 +61,11 @@ if [ $DEVELOPMENT_BRANCH ]; then
fi
fi
# upgrading file prevents USB canary from activating
if [ ! -f /tmp/.upgrading ]; then
touch /tmp/.upgrading
fi
if [ -f /usr/bin/backupdatabases ]; then
if grep -q "cat /root/dbpass" /usr/bin/backupdatabases; then
# update to using the password manager
@ -91,6 +96,7 @@ if [ -d "$PROJECT_DIR" ]; then
fi
if ! ${PROJECT_NAME} -c "$CONFIGURATION_FILE"; then
rm /tmp/.upgrading
exit 453536
fi
@ -118,4 +124,9 @@ fi
# If logging was left on then turn it off
${PROJECT_NAME}-logging off
# upgrading file prevents USB canary from activating
if [ -f /tmp/.upgrading ]; then
rm /tmp/.upgrading
fi
# deliberately there is no 'exit 0' here

28
src/freedombone-usb-canary
View File

@ -28,12 +28,24 @@
PROJECT_NAME=freedombone
UPTIME=$(awk -F '.' '{print $1}' < "/proc/uptime")
if [ "$UPTIME" -gt 120 ]; then
ADMIN_USER=$(grep 'Admin user' /root/${PROJECT_NAME}-completed.txt | awk -F ':' '{print $2}')
MY_EMAIL_ADDRESS=${ADMIN_USER}@$(cat /etc/hostname)
echo "USB device connected on ${DEVPATH}" | mail -s "${PROJECT_NAME} USB canary" "${MY_EMAIL_ADDRESS}"
echo "${ACTION}" > /tmp/usb-canary
echo "${MY_EMAIL_ADDRESS}" >> /tmp/usb-canary
date >> /tmp/usb-canary
if [ ! -f /tmp/.upgrading ]; then
UPTIME=$(awk -F '.' '{print $1}' < "/proc/uptime")
if [ "$UPTIME" -gt 240 ]; then
ADMIN_USER=$(grep 'Admin user' /root/${PROJECT_NAME}-completed.txt | awk -F ':' '{print $2}')
MY_EMAIL_ADDRESS=${ADMIN_USER}@$(cat /etc/hostname)
# Which devices have changed?
devices_changed=
if [ -f /tmp/.usb_devices ]; then
lsusb -v > /tmp/.curr_usb_devices
devices_changed=$(diff /tmp/.curr_usb_devices /tmp/.usb_devices)
rm /tmp/.curr_usb_devices
fi
echo -e "USB device connected on ${DEVPATH}\\n\\n${devices_changed}" | mail -s "${PROJECT_NAME} USB canary" "${MY_EMAIL_ADDRESS}"
echo "${ACTION}" > /tmp/usb-canary
echo "${MY_EMAIL_ADDRESS}" >> /tmp/usb-canary
date >> /tmp/usb-canary
fi
fi
lsusb -v > /tmp/.usb_devices

9
src/freedombone-utils-gnusocialtools
View File

@ -464,10 +464,13 @@ function gnusocial_hourly_script {
echo '/htdocs/scripts/queuedaemon.php" | grep "/var/www")';
echo "cd /var/www/${domain_name}/htdocs";
echo "if [[ \$daemon_lines != *\"/var/www/\"* ]]; then";
echo " ADMIN_USER=\$(cat $COMPLETION_FILE | grep 'Admin user' | awk -F ':' '{print \$2}')";
echo " MY_EMAIL_ADDRESS=\$ADMIN_USER@$HOSTNAME";
echo -n " echo \"Restarting ${gnusocial_type} daemons\" | mail -s \"${gnusocial_type} ";
echo " UPTIME=\$(awk -F '.' '{print \$1}' < \"/proc/uptime\")";
echo " if [ \"\$UPTIME\" -gt 500 ]; then";
echo " ADMIN_USER=\$(cat $COMPLETION_FILE | grep 'Admin user' | awk -F ':' '{print \$2}')";
echo " MY_EMAIL_ADDRESS=\$ADMIN_USER@$HOSTNAME";
echo -n " echo \"Restarting ${gnusocial_type} daemons\" | mail -s \"${gnusocial_type} ";
echo "daemons not found\" \$MY_EMAIL_ADDRESS";
echo ' fi';
echo ' su -c "sh scripts/startdaemons.sh" -s /bin/sh www-data';
echo 'fi';
echo 'php scripts/delete_orphan_files.php > /dev/null';

4
website/EN/index.html
View File

@ -3,7 +3,7 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
<head>
<!-- 2018-04-15 Sun 18:59 -->
<!-- 2018-05-13 Sun 11:58 -->
<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<title>&lrm;</title>
@ -265,7 +265,7 @@ Disk images which can be cloned straight to USB or microSD drives are <a href=".
</p>
<p>
If you find bugs, or want to add a new app to this system see the <a href="./devguide.html">Developers Guide</a> and <a href="./codeofconduct.html">Code of Conduct</a>. There is a Matrix chat room available at <b>#fbone:matrix.freedombone.net</b>.
If you find bugs, or want to add a new app to this system see the <a href="./devguide.html">Developers Guide</a> and <a href="./codeofconduct.html">Code of Conduct</a>. There is a Matrix chat room available at <b>#fbone:matrix.freedombone.net</b> and an XMPP channel at <b>support@chat.freedombone.net</b>.
</p>
<p>

68
website/EN/support.html
View File

@ -3,7 +3,7 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
<head>
<!-- 2018-05-11 Fri 17:27 -->
<!-- 2018-05-13 Sun 11:58 -->
<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<title>&lrm;</title>
@ -242,13 +242,13 @@ for the JavaScript code in this tag.
</p>
</div>
<div id="outline-container-orgf724cf8" class="outline-2">
<h2 id="orgf724cf8">Support</h2>
<div id="outline-container-org2a35610" class="outline-2">
<h2 id="org2a35610">Support</h2>
</div>
<div id="outline-container-orgc83c003" class="outline-2">
<h2 id="orgc83c003">Contact details</h2>
<div class="outline-text-2" id="text-orgc83c003">
<div id="outline-container-orge2e7a53" class="outline-2">
<h2 id="orge2e7a53">Contact details</h2>
<div class="outline-text-2" id="text-orge2e7a53">
<p>
This site can also be accessed via a Tor browser at <b><a href="http://yjxlc3imv7obva4grjae6u3qw527koaytrgjgdp364hmthrst3jodiid.onion">http://yjxlc3imv7obva4grjae6u3qw527koaytrgjgdp364hmthrst3jodiid.onion</a></b>
</p>
@ -267,7 +267,7 @@ This site can also be accessed via a Tor browser at <b><a href="http://yjxlc3imv
</div>
<p>
<b>XMPP:</b> bob@freedombone.net with OMEMO or OpenPGP
<b>XMPP channel:</b> support@chat.freedombone.net
</p>
<p>
@ -280,22 +280,22 @@ This site can also be accessed via a Tor browser at <b><a href="http://yjxlc3imv
</div>
</div>
<div id="outline-container-orgbff7600" class="outline-2">
<h2 id="orgbff7600">Things which would be nice to have</h2>
<div class="outline-text-2" id="text-orgbff7600">
<div id="outline-container-org6f7b25d" class="outline-2">
<h2 id="org6f7b25d">Things which would be nice to have</h2>
<div class="outline-text-2" id="text-org6f7b25d">
</div>
<div id="outline-container-orgc80da0b" class="outline-3">
<h3 id="orgc80da0b">Ideas</h3>
<div class="outline-text-3" id="text-orgc80da0b">
<div id="outline-container-orga0bd65e" class="outline-3">
<h3 id="orga0bd65e">Ideas</h3>
<div class="outline-text-3" id="text-orga0bd65e">
<p>
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.
</p>
</div>
</div>
<div id="outline-container-org4c61d84" class="outline-3">
<h3 id="org4c61d84">Money</h3>
<div class="outline-text-3" id="text-org4c61d84">
<div id="outline-container-orgc0b3a8b" class="outline-3">
<h3 id="orgc0b3a8b">Money</h3>
<div class="outline-text-3" id="text-orgc0b3a8b">
<p>
At the present time this project is not seeking any funding. There is no crowdfunding campaign and no slick marketing video. Those aren't ruled out as future possibilities, but for now they're just not needed.
</p>
@ -306,35 +306,35 @@ If you find this project useful then you may wish to consider donating to <a hre
</div>
</div>
<div id="outline-container-org45612ae" class="outline-3">
<h3 id="org45612ae">Testing and reporting bugs</h3>
<div class="outline-text-3" id="text-org45612ae">
<div id="outline-container-orgdb6bdb7" class="outline-3">
<h3 id="orgdb6bdb7">Testing and reporting bugs</h3>
<div class="outline-text-3" id="text-orgdb6bdb7">
<p>
Testing of the install on different hardware. Also pentesting on test installations to find vulnerabilities.
</p>
</div>
</div>
<div id="outline-container-org573e6df" class="outline-3">
<h3 id="org573e6df">Web design and artwork</h3>
<div class="outline-text-3" id="text-org573e6df">
<div id="outline-container-org422b096" class="outline-3">
<h3 id="org422b096">Web design and artwork</h3>
<div class="outline-text-3" id="text-org422b096">
<p>
A better design for this website would be nice to have. Photos, icons or other artwork are all welcome. I've always liked the cartoon artwork of the <a href="https://www.mediagoblin.org/">Mediagoblin</a> project, and attractive graphics can help to get people initially interested.
</p>
</div>
</div>
<div id="outline-container-org7dd2e41" class="outline-3">
<h3 id="org7dd2e41">Howto videos</h3>
<div class="outline-text-3" id="text-org7dd2e41">
<div id="outline-container-orge5eac99" class="outline-3">
<h3 id="orge5eac99">Howto videos</h3>
<div class="outline-text-3" id="text-orge5eac99">
<p>
If you're good at making videos then a howto for installing Freedombone onto various types of hardware, or testing the mesh system in realistic/exotic scenarios would be good. You could even host videos on PeerTube or Mediagoblin.
</p>
</div>
</div>
<div id="outline-container-orgd17ce5b" class="outline-3">
<h3 id="orgd17ce5b">More education and promotion</h3>
<div class="outline-text-3" id="text-orgd17ce5b">
<div id="outline-container-org1f0471f" class="outline-3">
<h3 id="org1f0471f">More education and promotion</h3>
<div class="outline-text-3" id="text-org1f0471f">
<div class="figure">
<p><img src="./images/educate.png" alt="educate.png" width="50%" align="center" />
@ -351,18 +351,18 @@ Raising awareness beyond the near zero current level, overcoming fear and parano
</div>
</div>
<div id="outline-container-orgc230168" class="outline-3">
<h3 id="orgc230168">Translations</h3>
<div class="outline-text-3" id="text-orgc230168">
<div id="outline-container-orgee84413" class="outline-3">
<h3 id="orgee84413">Translations</h3>
<div class="outline-text-3" id="text-orgee84413">
<p>
To add translations modify the json files within the <b>locale</b> subdirectory. Then make a pull request on the <a href="https://github.com/bashrc/freedombone">Github site</a>.
</p>
</div>
</div>
<div id="outline-container-org9271805" class="outline-3">
<h3 id="org9271805">Packaging</h3>
<div class="outline-text-3" id="text-org9271805">
<div id="outline-container-orgf7fcec0" class="outline-3">
<h3 id="orgf7fcec0">Packaging</h3>
<div class="outline-text-3" id="text-orgf7fcec0">
<p>
Helping to package GNU Social and Hubzilla for Debian would be beneficial.
</p>