thooge
/
ffpi-site
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

merge into: thooge:experimental
Branches Tags
thooge:experimental
thooge:master
thooge:beta
thooge:v0.9
thooge:v0.7.1
...
pull from: thooge:master
Branches Tags
thooge:experimental
thooge:master
thooge:beta
thooge:v0.9
thooge:v0.7.1

5 Commits
experiment ... master

Author SHA1 Message Date
Thomas Hooge e35d11bae1 Merge branch 'experimental' 2017-07-23 11:09:57 +02:00
Thomas Hooge 1abd153327 Tabs in Leerzeichen konvertiert 2017-07-23 09:26:00 +02:00
Thomas Hooge 66523e673d Groß- Kleinschreibung angeglichen 2016-10-20 19:49:42 +02:00
Thomas Hooge c36ee7fc50 Einstellungen für die autom. Aktivierung des Autoupdaters korrigiert 2016-10-19 21:09:14 +02:00
Thomas Hooge f4af7be190 Version 0.8 basierend auf Gluon 2016.1.6 2016-10-17 20:56:12 +02:00
5 changed files with 8 additions and 12 deletions
Show Stats Expand all files Collapse all files

6
README
View File

@ -1,9 +1,5 @@
Freifunk Community Pinneberg Freifunk Community Pinneberg
Site-Konfiguration "site-ffpi" Site-Konfiguration "site-ffpi"
Dieses ist der Experimental-Branch. Dieses ist der Stable-Branch.
Bitte nicht im Produktivbetrieb nutzen.
Es kann sich alles jederzeit unerwartet ändern.
Betrieb auf eigenes Risiko!

4
i18n/de.po
View File

@ -1,8 +1,8 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Project-Id-Version: FFPI 1.0\n" "Project-Id-Version: FFPI 1.2\n"
"PO-Revision-Date: 2016-10-20 19:18+0100\n" "PO-Revision-Date: 2017-07-23 11:06+0100\n"
"Last-Translator: Thomas Hooge <thomas@hoogi.de>\n" "Last-Translator: Thomas Hooge <thomas@hoogi.de>\n"
"Language-Team: German\n" "Language-Team: German\n"
"Language: de\n" "Language: de\n"

4
i18n/en.po
View File

@ -1,8 +1,8 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Project-Id-Version: FFPI 1.0\n" "Project-Id-Version: FFPI 1.2\n"
"PO-Revision-Date: 2016-10-20 19:18+0100\n" "PO-Revision-Date: 2017-07-23 11:06+0100\n"
"Last-Translator: Thomas Hooge <thomas@hoogi.de>\n" "Last-Translator: Thomas Hooge <thomas@hoogi.de>\n"
"Language-Team: English\n" "Language-Team: English\n"
"Language: en\n" "Language: en\n"

4
site.conf
View File

@ -5,7 +5,7 @@
opkg = { opkg = {
openwrt = 'http://1.download.services.ffpi/openwrt/%n/%v/%S/packages', openwrt = 'http://1.download.services.ffpi/openwrt/%n/%v/%S/packages',
extra = { extra = {
modules = 'http://1.download.services.ffpi/experimental/modules/gluon-%GS-%GR/%S', modules = 'http://1.download.services.ffpi/stable/modules/gluon-%GS-%GR/%S',
}, },
}, },
prefix4 = '10.137.0.0/16', prefix4 = '10.137.0.0/16',
@ -90,7 +90,7 @@
} }
}, },
autoupdater = { autoupdater = {
branch = 'experimental', branch = 'stable',
branches = { branches = {
stable = { stable = {
name = 'stable', name = 'stable',

2
site.mk
View File

@ -103,7 +103,7 @@ GLUON_SITE_PACKAGES += \
$(USB_PACKAGES_STORAGE) $(USB_PACKAGES_STORAGE)
endif endif
DEFAULT_GLUON_RELEASE := 0.9+exp$(shell date '+%Y%m%d') DEFAULT_GLUON_RELEASE := 0.9
# Allow overriding the release number from the command line # Allow overriding the release number from the command line
GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE) GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE)