Bladeren bron

Clean up, prepare stable release 0.8.0

Markus Lindenberg 8 jaren geleden
bovenliggende
commit
cfe56e0bed
4 gewijzigde bestanden met toevoegingen van 13 en 11 verwijderingen
  1. 2 1
      Dockerfile
  2. 1 0
      docker/build.sh
  3. 9 6
      site.conf
  4. 1 4
      site.mk

+ 2 - 1
Dockerfile

@@ -2,6 +2,7 @@ FROM debian:jessie
 MAINTAINER Markus Lindenberg <markus@lindenberg.io>
 
 ENV GLUON_TAG v2016.1
+ENV DEFAULT_GLUON_RELEASE 0.8.0
 
 ENV DEBIAN_FRONTEND noninteractive
 ENV DEBIAN_PRIORITY critical
@@ -11,7 +12,7 @@ RUN apt-get update
 RUN apt-get -y install --no-install-recommends ca-certificates python wget file git subversion build-essential gawk unzip libncurses5-dev zlib1g-dev openssl libssl-dev && apt-get clean
 
 
-ADD docker/build.sh /usr/src/build.sh
+ADD docker-build.sh /usr/src/build.sh
 ADD site.mk /usr/src/site.mk
 ADD site.conf /usr/src/site.conf
 ADD i18n /usr/src/i18n

+ 1 - 0
docker/build.sh

@@ -25,6 +25,7 @@ time make -j $(($(nproc)+1)) V=s BROKEN=1 GLUON_TARGET=x86-generic
 make dirclean
 time make -j $(($(nproc)+1)) V=s BROKEN=1 GLUON_TARGET=x86-64
 make dirclean
+make manifest GLUON_BRANCH=stable
 
 set +x
 echo -e "\nBUILD FINISHED\n"

+ 9 - 6
site.conf

@@ -51,7 +51,7 @@
 		methods = {'salsa2012+umac'},
 		mtu = 1280,
 		groups = {
-			do01 = {
+			ffdo = {
 				limit = 1,
 				peers = {
 					do01100 = {
@@ -62,11 +62,6 @@
 						key = 'd2de261203853d14389d80ca004c98d6a67c244bfe4096b7a6f36a0a8484c55a',
 						remotes = {'"snode01-2.ffdo.de" port 10000'},
 					},
-				},
-			},
-			do02 = {
-				limit = 1,
-				peers = {
 					do02100 = {
 						key = '12b94258d16f864c863f7bab07a77514eddffe3ba01c9d4948bd84a192d28f42',
 						remotes = {'"snode02-1.ffdo.de" port 10000'},
@@ -77,6 +72,14 @@
 					},
 				},
 			},
+			do01 = {
+				limit = 0,
+				peers = {},
+			},
+			do02 = {
+				limit = 0,
+				peers = {},
+			},
 			backbone = {
 				limit = 0,
 				peers = {},

+ 1 - 4
site.mk

@@ -32,10 +32,7 @@ DEFAULT_GLUON_RELEASE := 0.7.99.1
 GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE)
 
 GLUON_PRIORITY ?= 0
-GLUON_BRANCH ?= experimental
+GLUON_BRANCH ?= stable
 export GLUON_BRANCH
 
-GLUON_TARGET ?= ar71xx-generic
-export GLUON_TARGET
-
 GLUON_LANGS ?= en de