nils/gluon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

docs: rename Freifunk Entenhausen to Alpha Centauri (#955)

Browse Source
This commit is contained in:
Ruben Barkow 2016-12-06 20:02:51 +01:00 committed by Matthias Schiffer
parent 1677b62e4b
commit cb9b2335af
6 changed files with 29 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
docs/site-example/i18n/de.po
View File

@ -12,18 +12,18 @@ msgstr ""
msgid "gluon-config-mode:welcome" msgid "gluon-config-mode:welcome"
msgstr "" msgstr ""
"Willkommen zum Einrichtungsassistenten für deinen neuen Entenhausener " "Willkommen zum Einrichtungsassistenten für deinen neuen Alpha Centauri "
"Freifunk-Knoten. Fülle das folgende Formular deinen Vorstellungen " "Freifunk-Knoten. Fülle das folgende Formular deinen Vorstellungen "
"entsprechend aus und sende es ab." "entsprechend aus und sende es ab."
msgid "gluon-config-mode:pubkey" msgid "gluon-config-mode:pubkey"
msgstr "" msgstr ""
"<p>Dies ist der öffentliche Schlüssel deines Freifunk-Knotens. Erst nachdem " "<p>Dies ist der öffentliche Schlüssel deines Freifunk-Knotens. Erst nachdem "
"er auf den Servern des Entenhausener Freifunk-Projektes eingetragen wurde, " "er auf den Servern des Freifunk-Projektes auf Alpha Centauri eingetragen wurde, "
"kann sich dein Knoten mit dem Entenhausener Mesh-VPN verbinden. Bitte " "kann sich dein Knoten mit dem Mesh-VPN dort verbinden. Bitte "
"schicke dazu diesen Schlüssel und den Namen deines Knotens " "schicke dazu diesen Schlüssel und den Namen deines Knotens "
"(<em><%=escape(hostname)%></em>) an " "(<em><%=escape(hostname)%></em>) an "
"<a href=\"mailto:keys@entenhausen.freifunk.net\">keys@entenhausen.freifunk.net</a>." "<a href=\"mailto:keys@alpha-centauri.freifunk.net\">keys@alpha-centauri.freifunk.net</a>."
"</p>" "</p>"
"<div class=\"the-key\">" "<div class=\"the-key\">"
" # <%= escape(hostname) %>" " # <%= escape(hostname) %>"
@ -36,8 +36,8 @@ msgstr ""
"<p>Dein Knoten startet gerade neu und wird anschließend versuchen, " "<p>Dein Knoten startet gerade neu und wird anschließend versuchen, "
"sich mit anderen Freifunkknoten in seiner Nähe zu " "sich mit anderen Freifunkknoten in seiner Nähe zu "
"verbinden. Weitere Informationen zur " "verbinden. Weitere Informationen zur "
"Entenhausener Freifunk-Community findest du auf " "Alpha Centauri Freifunk-Community findest du auf "
"<a href=\"https://entenhausen.freifunk.net/\">unserer Webseite</a>.</p>" "<a href=\"https://alpha-centauri.freifunk.net/\">unserer Webseite</a>.</p>"
"<p>Um zu dieser Konfigurationsseite zurückzugelangen, drücke im normalen " "<p>Um zu dieser Konfigurationsseite zurückzugelangen, drücke im normalen "
"Betrieb für drei Sekunden den Reset-Button. Das Gerät wird dann im Config " "Betrieb für drei Sekunden den Reset-Button. Das Gerät wird dann im Config "
"Mode neustarten.</p>" "Mode neustarten.</p>"

11
docs/site-example/i18n/en.po
View File

@ -12,16 +12,15 @@ msgstr ""
msgid "gluon-config-mode:welcome" msgid "gluon-config-mode:welcome"
msgstr "" msgstr ""
"Welcome to the setup wizard of your new Freifunk Duckburg node. " "Welcome to the setup wizard of your new Freifunk Alpha Centauri node. "
"Please fill out the following form and submit it." "Please fill out the following form and submit it."
msgid "gluon-config-mode:pubkey" msgid "gluon-config-mode:pubkey"
msgstr "" msgstr ""
"<p>This is your Freifunk node's public key. The node won't be able to " "<p>This is your Freifunk node's public key. The node won't be able to "
"connect to the mesh VPN until the key has been registered on the Freifunk " "connect to the mesh VPN until the key has been registered on the Freifunk servers. "
"Duckburg servers. "
"To register, send the key together with your node's name (<em><%=escape(hostname)%></em>) to " "To register, send the key together with your node's name (<em><%=escape(hostname)%></em>) to "
"<a href=\"mailto:keys@entenhausen.freifunk.net\">keys@entenhausen.freifunk.net</a>." "<a href=\"mailto:keys@alpha-centauri.freifunk.net\">keys@alpha-centauri.freifunk.net</a>."
"</p>" "</p>"
"<div class=\"the-key\">" "<div class=\"the-key\">"
" # <%= escape(hostname) %>" " # <%= escape(hostname) %>"
@ -33,8 +32,8 @@ msgid "gluon-config-mode:reboot"
msgstr "" msgstr ""
"<p>The node is currently rebooting and will try to connect to other " "<p>The node is currently rebooting and will try to connect to other "
"nearby Freifunk nodes after that. " "nearby Freifunk nodes after that. "
"For more information on the Freifunk Duckburg community, have a look at " "For more information on the Freifunk Alpha Centauri community, have a look at "
"<a href=\"https://entenhausen.freifunk.net/\">our homepage</a>.</p>" "<a href=\"https://alpha-centauri.freifunk.net/\">our homepage</a>.</p>"
"<p>To get back to this configuration interface, press the reset button for " "<p>To get back to this configuration interface, press the reset button for "
"3 seconds during normal operation. The device will then reboot into config " "3 seconds during normal operation. The device will then reboot into config "
"mode.</p>" "mode.</p>"

4
docs/site-example/i18n/fr.po
View File

@ -23,7 +23,7 @@ msgstr ""
"sur les serveur Mesh-VPN de votre groupe Freifunk. Veuillez envoyer la clé avec le " "sur les serveur Mesh-VPN de votre groupe Freifunk. Veuillez envoyer la clé avec le "
"nom de votre nœud " "nom de votre nœud "
"(<em><%=escape(hostname)%></em>) à " "(<em><%=escape(hostname)%></em>) à "
"<a href=\"mailto:keys@entenhausen.freifunk.net\">keys@entenhausen.freifunk.net</a>." "<a href=\"mailto:keys@alpha-centauri.freifunk.net\">keys@alpha-centauri.freifunk.net</a>."
"</p>" "</p>"
"<div class=\"the-key\">" "<div class=\"the-key\">"
" # <%= escape(hostname) %>" " # <%= escape(hostname) %>"
@ -36,7 +36,7 @@ msgstr ""
"<p>Votre nœud es en train de redémarrer et va ensuite éssayer de se connecter " "<p>Votre nœud es en train de redémarrer et va ensuite éssayer de se connecter "
"avec les autres nœuds du réseau Freifunk " "avec les autres nœuds du réseau Freifunk "
"Vous pourrez trouver plus d'informations sur votre groupe Freifunk sur la page " "Vous pourrez trouver plus d'informations sur votre groupe Freifunk sur la page "
"<a href=\"https://entenhausen.freifunk.net/\"> de ton groupe </a>.</p> " "<a href=\"https://alpha-centauri.freifunk.net/\"> de ton groupe </a>.</p> "
"<p> Pour retrouver cette page de configuration veuillier appuyez pendant le " "<p> Pour retrouver cette page de configuration veuillier appuyez pendant le "
"fonctionement normal pendant 3 Secondes sur le bouton reset. L'appareil va ensuite " "fonctionement normal pendant 3 Secondes sur le bouton reset. L'appareil va ensuite "
"redémarer en mode configuration.</p> " "redémarer en mode configuration.</p> "

6
docs/site-example/site.conf
View File

@ -10,7 +10,7 @@
-- hostname_prefix = 'freifunk-', -- hostname_prefix = 'freifunk-',
-- Name of the community. -- Name of the community.
site_name = 'Freifunk Entenhausen', site_name = 'Freifunk Alpha Centauri',
-- Shorthand of the community. -- Shorthand of the community.
site_code = 'ffxx', site_code = 'ffxx',
@ -47,7 +47,7 @@
-- ESSID used for client network. -- ESSID used for client network.
ap = { ap = {
ssid = 'entenhausen.freifunk.net', ssid = 'alpha-centauri.freifunk.net',
-- disabled = true, (optional) -- disabled = true, (optional)
}, },
@ -65,7 +65,7 @@
wifi5 = { wifi5 = {
channel = 44, channel = 44,
ap = { ap = {
ssid = 'entenhausen.freifunk.net', ssid = 'alpha-centauri.freifunk.net',
}, },
mesh = { mesh = {
id = 'ffxx-mesh', id = 'ffxx-mesh',

2
docs/user/getting_started.rst
View File

@ -59,7 +59,7 @@ Now, enter the freshly created directory::
It's time to add (or create) your site configuration. If you already It's time to add (or create) your site configuration. If you already
have a site repository, just clone it:: have a site repository, just clone it::
git clone https://github.com/freifunk-duckburg/site-ffdb.git site git clone https://github.com/freifunk-alpha-centauri/site-ffac.git site
If you want to build a new site, create a new git repository *site/*:: If you want to build a new site, create a new git repository *site/*::

24
docs/user/site.rst
View File

@ -46,7 +46,7 @@ ntp_server
List of NTP servers available in your community or used by your community, e.g.: List of NTP servers available in your community or used by your community, e.g.:
:: ::
ntp_servers = {'1.ntp.services.ffeh','2.ntp.services.ffeh'} ntp_servers = {'1.ntp.services.ffac','2.ntp.services.ffac'}
This NTP servers must be reachable via IPv6 from the nodes. If you don't want to set an IPv6 address This NTP servers must be reachable via IPv6 from the nodes. If you don't want to set an IPv6 address
explicitly, but use a hostname (which is recommended), see also the :ref:`FAQ <faq-dns>`. explicitly, but use a hostname (which is recommended), see also the :ref:`FAQ <faq-dns>`.
@ -62,9 +62,9 @@ opkg \: optional
:: ::
opkg = { opkg = {
openwrt = 'http://opkg.services.ffeh/openwrt/%n/%v/%S/packages', openwrt = 'http://opkg.services.ffac/openwrt/%n/%v/%S/packages',
extra = { extra = {
modules = 'http://opkg.services.ffeh/modules/gluon-%GS-%GR/%S', modules = 'http://opkg.services.ffac/modules/gluon-%GS-%GR/%S',
}, },
} }
@ -124,10 +124,10 @@ wifi24 \: optional
supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000}, supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000},
basic_rate = {6000, 9000, 18000, 36000, 54000}, basic_rate = {6000, 9000, 18000, 36000, 54000},
ap = { ap = {
ssid = 'entenhausen.freifunk.net', ssid = 'alpha-centauri.freifunk.net',
}, },
mesh = { mesh = {
id = 'entenhausen-mesh', id = 'alpha-centauri-mesh',
mcast_rate = 12000, mcast_rate = 12000,
}, },
ibss = { ibss = {
@ -202,14 +202,14 @@ fastd_mesh_vpn
key = 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', key = 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX',
-- Having multiple domains prevents SPOF in freifunk.net -- Having multiple domains prevents SPOF in freifunk.net
remotes = { remotes = {
'ipv4 "vpn1.entenhausen.freifunk.net" port 10000', 'ipv4 "vpn1.alpha-centauri.freifunk.net" port 10000',
'ipv4 "vpn1.entenhausener-freifunk.de" port 10000', 'ipv4 "vpn1.alpha-centauri-freifunk.de" port 10000',
}, },
}, },
peer2 = { peer2 = {
key = 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', key = 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX',
-- You can also omit the ipv4 to allow both connection via ipv4 and ipv6 -- You can also omit the ipv4 to allow both connection via ipv4 and ipv6
remotes = {'"vpn2.entenhausen.freifunk.net" port 10000'}, remotes = {'"vpn2.alpha-centauri.freifunk.net" port 10000'},
}, },
}, },
-- Optional: nested peer groups -- Optional: nested peer groups
@ -262,7 +262,7 @@ autoupdater \: package
name = 'stable', name = 'stable',
mirrors = { mirrors = {
'http://[fdca:ffee:babe:1::fec1]/firmware/stable/sysupgrade/', 'http://[fdca:ffee:babe:1::fec1]/firmware/stable/sysupgrade/',
'http://autoupdate.entenhausen.freifunk.net/firmware/stable/sysupgrade/', 'http://autoupdate.alpha-centauri.freifunk.net/firmware/stable/sysupgrade/',
}, },
-- Number of good signatures required -- Number of good signatures required
good_signatures = 2, good_signatures = 2,
@ -317,9 +317,9 @@ legacy \: package
legacy = { legacy = {
version_files = {'/etc/.freifunk_version_keep', '/etc/.eff_version_keep'}, version_files = {'/etc/.freifunk_version_keep', '/etc/.eff_version_keep'},
old_files = {'/etc/config/config_mode', '/etc/config/ffeh', '/etc/config/freifunk'}, old_files = {'/etc/config/config_mode', '/etc/config/ffac', '/etc/config/freifunk'},
config_mode_configs = {'config_mode', 'ffeh', 'freifunk'}, config_mode_configs = {'config_mode', 'ffac', 'freifunk'},
fastd_configs = {'ffeh_mesh_vpn', 'mesh_vpn'}, fastd_configs = {'ffac_mesh_vpn', 'mesh_vpn'},
mesh_ifname = 'freifunk', mesh_ifname = 'freifunk',
tc_configs = {'ffki', 'freifunk'}, tc_configs = {'ffki', 'freifunk'},
wifi_names = {'wifi_freifunk', 'wifi_freifunk5', 'wifi_mesh', 'wifi_mesh5'}, wifi_names = {'wifi_freifunk', 'wifi_freifunk5', 'wifi_mesh', 'wifi_mesh5'},