From ac86ece25315566b6072fbdfe36e7e1d67577cd2 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Sun, 19 Jul 2015 18:50:05 +0100 Subject: [PATCH] Rename as bridge --- README.md | 2 +- doc/EN/variants.org | 1 + man/freedombone.1.gz | Bin 4757 -> 4757 bytes src/freedombone | 8 ++--- website/EN/variants.html | 74 ++++++++++++++++++++++----------------- 5 files changed, 48 insertions(+), 37 deletions(-) diff --git a/README.md b/README.md index 809ca00c..69af4654 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ The Freedombone system can be installed onto a Beaglebone Black, or any system c - **Writer**: Host your blog and wiki - **Chat**: Encrypted IRC, XMPP, Tox and VoIP services for one-to-one and many-to-many chat - **Developer**: Host your own git projects with a Github-like user interface - - **Mesh**: mesh network gateway to the internet + - **Mesh**: mesh network bridge to the internet - **Nonmailbox**: Installs eveything except for the email server Freedombone has an emphasis on security and privacy, and when installed on a Beaglebone Black it uses the built-in hardware random number generator as an entropy source. All communications with the box are encrypted by default using the recommendations from https://bettercrypto.org. The firewall is configured to only allow communications on the necessary ports and to drop all other packets, icmp is disabled by default, emails are stored in encrypted form using your public key and time synchronisation occurs via TLS only. Backups are also encrypted and can be local or remote. diff --git a/doc/EN/variants.org b/doc/EN/variants.org index 1a3b11e3..ffd893e4 100644 --- a/doc/EN/variants.org +++ b/doc/EN/variants.org @@ -19,4 +19,5 @@ Freedombone may be installed either in its entirety or as different variants wit | *Writer* | Host your blog and wiki | | *Chat* | Encrypted IRC and XMPP services for one-to-one and many-to-many chat | | *Developer* | Github-like system to host your software projects | +| *Mesh* | Mesh network bridge to the internet | | *Nonmailbox* | Installs eveything except for the email server | diff --git a/man/freedombone.1.gz b/man/freedombone.1.gz index a14f73255952511b3a78609db63d52a36484d7de..0da452c38b3b9cb59bb272c697af259e43f80a8d 100644 GIT binary patch delta 3650 zcmV-I4!!Y}C6y%xABzY8!{V_9c?5r!CGkR9T`QwCLl0HD_KI<+I6^*0a$^eTR@IwE zqnb}H!S6L3FF-cFvdO(M2#$4|aoJ+pt6$wI2L z9TdYRU(g#cg1|CK7m$wI^PEF2joIkyv$L5rU@M(m|Ln>|wl29p} z2X>I{?xE#8NGhR1I?Q(Lyfw28=VFjW=Y#?f#ewKi8W>^{tvB>aoM;LrRT56E+%(gu z!6WP@X@y#dckSq8&D+=z{3w5|Z@#Y(|fkS%6%t&D^hYwtPfQZ?uS^Kxi_oWWx9!(bg873ZV`2+7Zlb)(Sn zCNC8MD3KONdjE-%ncN_?fdgijo^MoI3j{4V9zp^qz~PhwPn6|`eQ|%JV#JV;-5LpK zMp{B1yU_j(<&tvUa#62845sbDpl!ome@;AyS|ej1vBx&xkX*wBFR`Oy*8P@ib8Yk1 zc=Nar&7{hchv(Mwa|`DijSz)}4HH1T^x-ryE&GVh zV}#0$X)ci4=Nss~&6$7vl0QIR3LcnzCE01*gyNE5*i{SOMj}gI!WqkgU04f@I-7-h znMG$++0vOP7W+%<@Uf`$94p)R-Tw5X5hQ6utb%Y7Ey6ur+Ab5sgKYvtXC$r^mQ{q_ zO7YUP%1&aQlPA;p?6(4vEzVXu8>lQ32ci8P-blL_IF3t-hA@A%Cb)?DI$4wPB2-(= z5S-`X&uA&(;I?$4QVhmQIyU!pi`zL8cr6tFx{r=UfqA!%X!iT zEfz{~wL(g$@)aCoky%+|hMi^*zl#)3v&NI&xIJMT6(2_v(do5s2ffZ{*b|*W`{uJZ z+#hgFstQxEy#eOQK{%_KvVKHm&Kis7t&bTI?b}3C!fJng0pzwJCjfQalWG%r?xtb& zZUGaA-O9x;EAEZNyO0dlT?q(SiqO69@*BBcf(xPX8WyLijd{YZDi`;DSkf~%|#-#R@CR;)e>7`M$u^~wV`Bb5DY{lQ3uQ^7m$=OWH53>qu9k3gL=K-ZiVMC+AyMYVGlVg zYRc_D_r3-7U?ZOsTl>>CLcO*qMU*ws6|F^@Zx(;>>qvX3X0v)-UhZQ=v=Plr{PWDg z`?k!_)yUKzKe#gb`ix4lv!Z$9L*leIY2QryUwR_wP4CBC4%S+H$NG=N>728kA~kcB z*qX9vdPKvn(yEW$vgOx&n0C&&^iZ~_JK7)gWP|1F-R}_Vg6MyIEFF@=AWw_Loic)L zxO;!0U72W~knITva&VlfvbOBqHX7f&=aVZal#7|JkadOto>r@R8;v=amzhhBtdk2# z;s_kTsc>j;*V8`os&C?mHgSyOjI?U-MZyCO*}`rOoGlc_c0;_UuFzSO`$sjSMA+YJ zQ|dCE`v0agjv0rMmkmX9$|4FF6bTrc*j|4;Yen-#gZKvk9X^%WnWpYt>4P{iBFRu- zLwcQo%oWW7TGX4$wz?TSP44J0SI($cvBm6ZxH&nc&ZVpSuJKGf=_*Jxsa z*Ai;|9C_-f6&*2@W^}*}HOT7C*wxnx&I$pQSF z==MIg?+4R|?&z-FA3o5uj<{|`u`4>(XV2@+<}3jrPYOwz64kYXaS;ZCMchf71F z)+Sh^=B@+9*?29Pqm(iy#MF8zfeYmPNU21R z?`j9Z*U_Z=!B38;qkj4N-TCFkTTdS!zuQrZb%?{GY?!!NA2xfSZSc_Ub|-(mAgFNQ z=L1Ryqnq~NVc47Ez0VIIaN55i758V)-(R%O-(I!OTW??Sfyw9|R(~Ai;>~M@=?&YR zLGOX*1_hIPoql`xfbwPZVQx09T(@jXq2LTr1ipOfP0l}Dy=h&Xziz#|Y`wkQ+r0R2 zaehfV@6TJ8Z+P=-|8xIg+Mj<8NR-?X6(%umX3Cr2l{OgG8H{er8z>Rxosai}0dLjM zm%}rAzJD_r9Rb@L-&ywcx_9mAr2p$4?B3LjVMkwwH-piAcMr5ak83nKFbCfQC}*Iq zlVn?3)#X!~#JY}>JH>rAFUIHA^QoHQHZ zQQ^?oi~rmqP{fv4^HId_Nhw=He_~o zfEv3p*>M;ipDz_L`FK&K7Mg-|s@~g`(B7h00jKH!c_@Fq>boD((XHKSW@g zEBK3lV?O*3yV-yAzdtrBKes79O{Zh~m;YV864lM1y7~I`Ww9B+2CFAYs>LQx=PH}$ z?_a%oar5e;vdPmn{_71cY_;(Jmq#}3@6E;A_eW1&y`qy>=f!4!a#O?h?c4Y7Ufg_- zU$IGFQq(qIpI;T5J@;)v$-av>FK@oNdiV0?>$l%I`Tl=>$pjulmYZ*1zq=%ae4%W! zp5UZ0F4bIRg;U&YR>d%?w0vl1S=>~HIo80OAsjU_5zc)9?_2;)3(2+Z%3`5riEM|q z*;QJi>oxCN+UYSN7t|6>lk1H!WBG$~SMJn(*kJ?pmrB`&rCHqN z#vHT?0`a3>CUf&g{S%K`Sr@X$l6WN7H) zGaY|fYOalI^cbQX%)yO<20*APWz%rTO{*Uk=1hOnfM8y-7ds>FiQ@H`L7XjT{q zy%EQ!Wi*cIJBifJLQCr>3*ei%%j?r3*I@Y{Th6|EQwd#~4vim*w+_IwwS%tc$;;3L z+vG31nvO1gNEmM5JNX97)4N``-xgGw^>2TAMFXhpwfGr1Rnc}_#9zfU;L&wrxx>>C z;{IlpF9fG8<=1M&XD<~m3zwyZ#)Q$b$zRa$f+f@~G^W&ff@kDUedzP0m2F^f40kgf z>)p#yhwT)hWLwy85kkv^j51Lo+I~GzVy9URi!o@WA}HI5cZ`nB!X2cxsSqRD68C@3 z3>dL!mC*M{e(0s_aCNO_l;zovf{Jg1Y;otuIK|M0Sz0j-WTFxlWWO{j#z)n!WW0I~ zm2p0waapqEmMVZiVC?(~!A(^SQKmZ2+)>7tzkG7aU$TqFig{ufF{@8IdVaf9_KO;( z%F$z4T@{x7HpNy_$9Z6@A3ss1pk;qMsGjC6e`)LUT<;b-?VHc{V|W2*%#6PjspbSn zl=74`q^utfIeDNrr%umz8|jqSK2(k$5E3|jXIvc?aFLXPrwez+!FaUqZ-Mhf^7oaq zd;tSDq;LOL1Mw`;I+xmiDc|df_8=J5KC&l&Lu0=m&wo0t_nBEmk8b%0d~AP%BKEO$ z@+dF7aj$Xfhqre;59YNkvQ=~n*OGV0Hb)+}p`Z^vi1Z5)5C%^8#dpzZ2%LmQkLOv05ump2BE%YWca8saIKWkyP%`WqnvE zORIb771GLJcI;JfWs+Ao+!%=JL7*y#RwuH`!y2K zjI@MYcA@56`XV=N8U48Y7s&imW`O`UoWX8)A5sl?r2i3dBix8zz8w>Emf)TJ{m0 z$B301(_A3A&o|I}n>2s+-mbv6t2 zGK43TTbwO-Hc(k64nq4oypeVhwfcCsepMXa`( zAvn>)pV3mn!ENb8r5cQtbaqY~#8fO$x&WkYlugMZO)^K)ky9278#=)oE6N5=Ahqvg zQ8w{F#hkN}hhl~lCfiX`14K!+XbsX3(CuVnSn1(JNL@&^&vKoe;Y?Lj#60ju82M~t zJMi(URv{6(qAPzUZFS9VY5BKYlJs0uV5de`Q2cqcL8r`1G@LAOVY*G#y}JLd*Yl(c zS}c^}a)p#o~gK$Z&sK3Ph;0 z6{V7d$SEmj2|f?~L_SQD^Rx9Nq7vi+Gb;WwlMDE0Ndd@ZGjXLxcZrit4xQ~NQdGNl*@zrMNSPsZ~*}$cJY>@`;qpB_ZvmC1Xo!fzIAr4 z*;|qys%5ssjH1<0YD3A=AQ*^9q7axPZ57MQY|s zu{EX9^oWLCrBxrhWy`PmFzuXk>7i^@ceFw1$p*{UyWb(!1=0WbSUMz!L7ouDc()i-fOn>faCMp`xaBH@9CY+<(s&K3$|+acalSLiJ2{iB*uBJA(A zDRr4n{eROL$Be_s%Z4I4Wf27oiUf>JY%hPFwW9f=LHq-N4xh^GOjG-=^g)~$kz^>a zA-&E(=8A>^E$Z39y)Krf^us=Ri=WtC6JtRn=ef-=>L{2&_Ws_leDp|q^Ek**@1l9u`R>2yA%%3g^i@nJj}ed%|5lMl|dSe=2LhVv{;VrspVzy)%Crc|QG zceR7y>uA#b;73Q)Qonrt?)>uNt*4KV-|eW!I>g~oHcZ^G51T#EHh5@vyOV!j5L7tu z^8uxU(M@~sFzik7-scApIPKq%iu<$Y?=M>CZ?9VCt+%iEz+`j}t3M8M@#Zzd^oH%u zp!dLogMvxDPQN{TK>0HIFgKf4u3NUHP;iDQ0$;xLCg&fn-n1^xU$@>}w%%UuZC-r1 zIKQNw_vfw4H@x|^|GED#?N5IPBuegy3X>Q&H090jN*fI83`V!*4U`D;&d2+~fVb-B z%juat-@loRj)3jW?=1Uz-MjX5(*Jc2c5iIPu%oZTo5AS5y9Zhy$Tb=rn1k;DltWP0 zNwO`i>hdX#VqHhco#H;57vpp5`P9}oWO6gfV`*2%`suJuD4ZSELH2*D5*TFQ!`%z1 z2@-x|s~YPoxLj}5!`KW3TI%kv_P<=bAxdLqi$vSvJ*;!D|GnrorPrdF#PS?8~hhJQDPZf?W{eu$7frlUlKauTX~IZ10d}z42fIlM3JS1r(ga6;R|KS ziYe4*DQWN57H3d(HL#{zbrirAXN$I$?{^{gLec8kLS-!A8yAccn9Z+P6?cL9A0n{L z75v4&F(3Yi-E4pQ-yfTmpW76lrqi+g%m1!kiRxxh-F*G}ve*n@gVmEH)nb#!bCu2W z_pe^PxOsI^+2nB>|MdnJwp#fA%Ojii_vYg5`=ckXUeU>`^J23?$qM^_urB?ev(b+37&{u0QM}!<-ynl%jv{&JVB21YxDt-DE1_gIUh=aGLNFD-oHVWSVein>(T|$hpzj6OM#MCH5%Y zM*z5tdU%>T`Y>JCtgMG3*AUjO$CVWw5o_kvA{BWEe>>BpjD&_Fd-MDnaJF`^)&>3^ zIBvA;Y7(bXJtuCs8KeEOE-k(hW0_HlI(2+IeA|EDRXpy$Q1F+BmcRQalSN7_XbSs> zL*W1emH9TZo9KWhZfo;Qg_9Zid_ZHK7S~tsa%+rDBiMv%=o|h??686QOQmeX(k$+B zV-8vcf%s7`lezh${)tDetP9y=Nj_8>Rms{9H$Hjz<;(DtpV&N+PWlm!?L+ZrGBot@ znT~%fHP^;9dJItx=HN!bm7L70YlxyU<`_xfYi9>0Ls-(s4Ue5JRboMDc%BDkG%E~* z-iYJVG8)J9p+stDp{4bc1@O(><@ITiYq0!}EoWc7se~>~hsF=ZTL<9T+Cf+J0PheZwo5T`Zs^Qq5)L)TKtThs%Sed;?H6l@aQ_R+~H{m zaeuSQ7lPB4@^dxfvzLmOh0D@HW5Q_Jv=O6Y?mKlD;|xVly|%JS@2LB&Txwz%_SoMLFhEUlOZGEoT&vY#3iLnAN8pJ-=Nl`$Y{? z<>;}jt_sV3n_?@e<2W*DON4I`;~+$n<`WG((QQ?s8lHB%;ubSr;s8TIEzYnC;}x8t+h@$I$fwclS| z^e(S>wUd}NeY>@g*P?URyofTs=F4^G=}SD%J}n38FVk3WZXQ3&WU8`zse=KZ`YLDF UtW?mc`df{E0iy4Nz27ka0QDeF@c;k- diff --git a/src/freedombone b/src/freedombone index e7a0c216..1916384a 100755 --- a/src/freedombone +++ b/src/freedombone @@ -1576,13 +1576,13 @@ function get_mesh_essid { fi } -function mesh_batman { +function mesh_batman_bridge { # https://sudoroom.org/wiki/Mesh/Relay_setup # also see http://www.netlore.co.uk/airmesh/ # https://www.youtube.com/watch?v=CLKHWfQlFqQ # http://pastebin.com/4U9vdFFm # http://pastebin.com/eeTmL5XL - if grep -Fxq "mesh_batman" $COMPLETION_FILE; then + if grep -Fxq "mesh_batman_bridge" $COMPLETION_FILE; then return fi if [[ $ENABLE_BATMAN != "yes" ]]; then @@ -1675,7 +1675,7 @@ function mesh_batman { chmod 600 /home/$MY_USERNAME/README fi - echo 'mesh_batman' >> $COMPLETION_FILE + echo 'mesh_batman_bridge' >> $COMPLETION_FILE } function remove_instructions_from_motd { @@ -9783,7 +9783,7 @@ configure_internet_protocol create_git_project mesh_cjdns mesh_cjdns_tools -mesh_batman +mesh_batman_bridge backup_github_projects configure_ssh remove_instructions_from_motd diff --git a/website/EN/variants.html b/website/EN/variants.html index ddf6732f..e3493156 100644 --- a/website/EN/variants.html +++ b/website/EN/variants.html @@ -4,16 +4,22 @@ - + +