From cb9b2335af346751d421ebdf9cddb432f3cdf1d0 Mon Sep 17 00:00:00 2001 From: Ruben Barkow Date: Tue, 6 Dec 2016 20:02:51 +0100 Subject: [PATCH] docs: rename Freifunk Entenhausen to Alpha Centauri (#955) --- docs/site-example/i18n/de.po | 12 ++++++------ docs/site-example/i18n/en.po | 11 +++++------ docs/site-example/i18n/fr.po | 4 ++-- docs/site-example/site.conf | 6 +++--- docs/user/getting_started.rst | 2 +- docs/user/site.rst | 24 ++++++++++++------------ 6 files changed, 29 insertions(+), 30 deletions(-) diff --git a/docs/site-example/i18n/de.po b/docs/site-example/i18n/de.po index c3c763dd..872d2d1c 100644 --- a/docs/site-example/i18n/de.po +++ b/docs/site-example/i18n/de.po @@ -12,18 +12,18 @@ msgstr "" msgid "gluon-config-mode:welcome" 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 " "entsprechend aus und sende es ab." msgid "gluon-config-mode:pubkey" msgstr "" "

Dies ist der öffentliche Schlüssel deines Freifunk-Knotens. Erst nachdem " -"er auf den Servern des Entenhausener Freifunk-Projektes eingetragen wurde, " -"kann sich dein Knoten mit dem Entenhausener Mesh-VPN verbinden. Bitte " +"er auf den Servern des Freifunk-Projektes auf Alpha Centauri eingetragen wurde, " +"kann sich dein Knoten mit dem Mesh-VPN dort verbinden. Bitte " "schicke dazu diesen Schlüssel und den Namen deines Knotens " "(<%=escape(hostname)%>) an " -"keys@entenhausen.freifunk.net." +"keys@alpha-centauri.freifunk.net." "

" "
" " # <%= escape(hostname) %>" @@ -36,8 +36,8 @@ msgstr "" "

Dein Knoten startet gerade neu und wird anschließend versuchen, " "sich mit anderen Freifunkknoten in seiner Nähe zu " "verbinden. Weitere Informationen zur " -"Entenhausener Freifunk-Community findest du auf " -"unserer Webseite.

" +"Alpha Centauri Freifunk-Community findest du auf " +"unserer Webseite.

" "

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 " "Mode neustarten.

" diff --git a/docs/site-example/i18n/en.po b/docs/site-example/i18n/en.po index 94aa8bc5..e119818b 100644 --- a/docs/site-example/i18n/en.po +++ b/docs/site-example/i18n/en.po @@ -12,16 +12,15 @@ msgstr "" msgid "gluon-config-mode:welcome" 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." msgid "gluon-config-mode:pubkey" msgstr "" "

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 " -"Duckburg servers. " +"connect to the mesh VPN until the key has been registered on the Freifunk servers. " "To register, send the key together with your node's name (<%=escape(hostname)%>) to " -"keys@entenhausen.freifunk.net." +"keys@alpha-centauri.freifunk.net." "

" "
" " # <%= escape(hostname) %>" @@ -33,8 +32,8 @@ msgid "gluon-config-mode:reboot" msgstr "" "

The node is currently rebooting and will try to connect to other " "nearby Freifunk nodes after that. " -"For more information on the Freifunk Duckburg community, have a look at " -"our homepage.

" +"For more information on the Freifunk Alpha Centauri community, have a look at " +"our homepage.

" "

To get back to this configuration interface, press the reset button for " "3 seconds during normal operation. The device will then reboot into config " "mode.

" diff --git a/docs/site-example/i18n/fr.po b/docs/site-example/i18n/fr.po index c38dca6e..e83ce0de 100644 --- a/docs/site-example/i18n/fr.po +++ b/docs/site-example/i18n/fr.po @@ -23,7 +23,7 @@ msgstr "" "sur les serveur Mesh-VPN de votre groupe Freifunk. Veuillez envoyer la clé avec le " "nom de votre nœud " "(<%=escape(hostname)%>) à " -"keys@entenhausen.freifunk.net." +"keys@alpha-centauri.freifunk.net." "

" "
" " # <%= escape(hostname) %>" @@ -36,7 +36,7 @@ msgstr "" "

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 " "Vous pourrez trouver plus d'informations sur votre groupe Freifunk sur la page " -" de ton groupe .

" +" de ton groupe .

" "

Pour retrouver cette page de configuration veuillier appuyez pendant le " "fonctionement normal pendant 3 Secondes sur le bouton reset. L'appareil va ensuite " "redémarer en mode configuration.

" diff --git a/docs/site-example/site.conf b/docs/site-example/site.conf index 8949ebb9..07639b18 100644 --- a/docs/site-example/site.conf +++ b/docs/site-example/site.conf @@ -10,7 +10,7 @@ -- hostname_prefix = 'freifunk-', -- Name of the community. - site_name = 'Freifunk Entenhausen', + site_name = 'Freifunk Alpha Centauri', -- Shorthand of the community. site_code = 'ffxx', @@ -47,7 +47,7 @@ -- ESSID used for client network. ap = { - ssid = 'entenhausen.freifunk.net', + ssid = 'alpha-centauri.freifunk.net', -- disabled = true, (optional) }, @@ -65,7 +65,7 @@ wifi5 = { channel = 44, ap = { - ssid = 'entenhausen.freifunk.net', + ssid = 'alpha-centauri.freifunk.net', }, mesh = { id = 'ffxx-mesh', diff --git a/docs/user/getting_started.rst b/docs/user/getting_started.rst index f5f4759d..5bb81b5a 100644 --- a/docs/user/getting_started.rst +++ b/docs/user/getting_started.rst @@ -59,7 +59,7 @@ Now, enter the freshly created directory:: It's time to add (or create) your site configuration. If you already 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/*:: diff --git a/docs/user/site.rst b/docs/user/site.rst index 8e9371ee..eb830416 100644 --- a/docs/user/site.rst +++ b/docs/user/site.rst @@ -46,7 +46,7 @@ ntp_server 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 explicitly, but use a hostname (which is recommended), see also the :ref:`FAQ `. @@ -62,9 +62,9 @@ opkg \: optional :: opkg = { - openwrt = 'http://opkg.services.ffeh/openwrt/%n/%v/%S/packages', + openwrt = 'http://opkg.services.ffac/openwrt/%n/%v/%S/packages', 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}, basic_rate = {6000, 9000, 18000, 36000, 54000}, ap = { - ssid = 'entenhausen.freifunk.net', + ssid = 'alpha-centauri.freifunk.net', }, mesh = { - id = 'entenhausen-mesh', + id = 'alpha-centauri-mesh', mcast_rate = 12000, }, ibss = { @@ -202,14 +202,14 @@ fastd_mesh_vpn key = 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', -- Having multiple domains prevents SPOF in freifunk.net remotes = { - 'ipv4 "vpn1.entenhausen.freifunk.net" port 10000', - 'ipv4 "vpn1.entenhausener-freifunk.de" port 10000', + 'ipv4 "vpn1.alpha-centauri.freifunk.net" port 10000', + 'ipv4 "vpn1.alpha-centauri-freifunk.de" port 10000', }, }, peer2 = { key = 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', -- 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 @@ -262,7 +262,7 @@ autoupdater \: package name = 'stable', mirrors = { '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 good_signatures = 2, @@ -317,9 +317,9 @@ legacy \: package legacy = { version_files = {'/etc/.freifunk_version_keep', '/etc/.eff_version_keep'}, - old_files = {'/etc/config/config_mode', '/etc/config/ffeh', '/etc/config/freifunk'}, - config_mode_configs = {'config_mode', 'ffeh', 'freifunk'}, - fastd_configs = {'ffeh_mesh_vpn', 'mesh_vpn'}, + old_files = {'/etc/config/config_mode', '/etc/config/ffac', '/etc/config/freifunk'}, + config_mode_configs = {'config_mode', 'ffac', 'freifunk'}, + fastd_configs = {'ffac_mesh_vpn', 'mesh_vpn'}, mesh_ifname = 'freifunk', tc_configs = {'ffki', 'freifunk'}, wifi_names = {'wifi_freifunk', 'wifi_freifunk5', 'wifi_mesh', 'wifi_mesh5'},