extra/template.conf

@@ -21,7 +21,7 @@
 	opkg = {
 		openwrt = 'http://firmware.srv.in.ffho.net/openwrt/packages-%v/%A',
 		extra = {
-			gluon = 'http://firmware.srv.in.ffho.net/%GR/modules/%S',
+			gluon = 'http://firmware.srv.in.ffho.net/%GR/packages/%S',
 		},
 	},
 
@@ -101,8 +101,8 @@
 							key = '629b2742922f068ef49558283aea4b75c1427d8cdd3fcd2dbd7c00880547d3b3',
 							remotes = {
 								'"gw03.ffho.net" port 100%ID',
-								'ipv6 "2a00:13c8:1000:2::165" port 100%ID',
-								'ipv4 "185.46.137.165" port 100%ID',
+								'ipv6 "2a00:13c8:1000:2::147" port 100%ID',
+								'ipv4 "185.46.137.147" port 100%ID',
 							},
 						},
 						gw04 = {

modules

@@ -2,4 +2,4 @@ GLUON_SITE_FEEDS='ffho'
 
 PACKAGES_FFHO_REPO=https://git.ffho.net/freifunkhochstift/ffho-packages.git
 PACKAGES_FFHO_BRANCH=master
-PACKAGES_FFHO_COMMIT=0cc6f952e9489bf0794b906f70285fef14bb56e3
+PACKAGES_FFHO_COMMIT=31b7d547abf57e27f15311b4d92146f2389b9e50

scripts/gensites.py

@@ -1,14 +1,14 @@
-#!/usr/bin/python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
 import os,sys
 
 if not 'GLUON_SITEDIR' in os.environ:
-    print "GLUON_SITEDIR not set"
+    print ("GLUON_SITEDIR not set")
     sys.exit(1)
 
-execfile(os.environ['GLUON_SITEDIR'] + "/extra/sites.conf")
-execfile(os.environ['GLUON_SITEDIR'] + "/extra/groups.conf")
+exec(open(os.environ['GLUON_SITEDIR'] + "/extra/sites.conf").read())
+exec(open(os.environ['GLUON_SITEDIR'] + "/extra/groups.conf").read())
 DOMAINS=os.environ['GLUON_SITEDIR'] + "/domains/"
 TEMPLATE = ""
 with open(os.environ['GLUON_SITEDIR'] + "/extra/template.conf") as f:

site.mk

@@ -54,7 +54,7 @@ ifeq ($(GLUON_TARGET),x86-64)
 endif
 
 # 0.2~1 < 0.2 < 0.2+1 < 0.2-1 < 0.2.1 < 0.3
-DEFAULT_GLUON_RELEASE := 1.4.1~exp$(shell date '+%Y%m%d')
+DEFAULT_GLUON_RELEASE := 1.5.0~exp$(shell date '+%Y%m%d')
 DEFAULT_GLUON_PRIORITY := 0
 
 GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE)