Skip to content
Snippets Groups Projects
Commit 2e578437 authored by Jan-Tarek Butt's avatar Jan-Tarek Butt
Browse files

Merge branch '0.5.5'

parents 083fa6b4 f0bb1e87
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
site.conf
+ 1
− 1
View file @ 2e578437
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
limit = 2, limit = 2,
peers = { peers = {
vpn01 = { vpn01 = {
key = '3f91292e8aec1e42d699bc1ba9fd12289099db3aecd1bee84f0b893ff820774f', key = '39f83c6e16b62273329aee0d04d420fa8d0637e6621a76ff680f6273e75c0c8d',
remotes = {'"vpn01.ffnw.de" port 11111'}, remotes = {'"vpn01.ffnw.de" port 11111'},
}, },
vpn02 = { vpn02 = {
......
site.mk
+ 1
− 1
View file @ 2e578437
...@@ -26,7 +26,7 @@ GLUON_SITE_PACKAGES := \ ...@@ -26,7 +26,7 @@ GLUON_SITE_PACKAGES := \
ffnw-configurator \ ffnw-configurator \
ffnw-nodewatcher ffnw-nodewatcher
DEFAULT_GLUON_RELEASE := 0.5.5+0$(shell date '+%Y%m%d') DEFAULT_GLUON_RELEASE := 0.5.5.2+0$(shell date '+%Y%m%d')
# 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)
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment