From f7217108d9fd4dfbf69c760186d88eb2cbb5dbe3 Mon Sep 17 00:00:00 2001 From: Matthias Hannig Date: Wed, 30 Nov 2016 13:14:12 +0100 Subject: [PATCH 1/2] fixed startup script --- .gitignore | 2 ++ VERSION | 2 +- etc/init/bird4watcher.conf | 2 +- etc/init/bird6watcher.conf | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 251ae28..b978237 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,5 @@ birdwatcher birdwatcher-* DIST/ + +etc/ecix diff --git a/VERSION b/VERSION index 7dea76e..6d7de6e 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.0.1 +1.0.2 diff --git a/etc/init/bird4watcher.conf b/etc/init/bird4watcher.conf index 0293fff..c8430ef 100644 --- a/etc/init/bird4watcher.conf +++ b/etc/init/bird4watcher.conf @@ -10,5 +10,5 @@ respawn limit 20 10 start on starting birdwatcher stop on stopping birdwatcher -exec /opt/ecix/birdwatcher/bin/birdwatcher-linux-amd64 -birdc bird -port 29184 2>&1 | logger -i -t 'BIRD4 WATCHER' +exec /opt/ecix/birdwatcher/bin/birdwatcher-linux-amd64 -birdc birdc -port 29184 2>&1 | logger -i -t 'BIRD4 WATCHER' diff --git a/etc/init/bird6watcher.conf b/etc/init/bird6watcher.conf index 642c095..d166f96 100644 --- a/etc/init/bird6watcher.conf +++ b/etc/init/bird6watcher.conf @@ -10,5 +10,5 @@ respawn limit 20 10 start on starting birdwatcher stop on stopping birdwatcher -exec /opt/ecix/birdwatcher/bin/birdwatcher-linux-amd64 -birdc bird6 -port 29185 2>&1 | logger -i -t 'BIRD6 WATCHER' +exec /opt/ecix/birdwatcher/bin/birdwatcher-linux-amd64 -birdc birdc6 -port 29185 2>&1 | logger -i -t 'BIRD6 WATCHER' From bb1f3b7eaf67341f8f428ca6b828754f0b5c7e0c Mon Sep 17 00:00:00 2001 From: Matthias Hannig Date: Wed, 30 Nov 2016 13:16:39 +0100 Subject: [PATCH 2/2] vbump --- Makefile | 5 +++-- VERSION | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index c3315c6..6b61f41 100644 --- a/Makefile +++ b/Makefile @@ -56,8 +56,6 @@ dist: clean linux rpm: dist # Clear tmp failed build (if any) - rm -f $(RPM) - rm -fr $(LOCAL_RPMS) mkdir $(LOCAL_RPMS) # Create RPM from dist @@ -68,6 +66,9 @@ rpm: dist remote_rpm: build_server dist + + mkdir -p $(LOCAL_RPMS) + # Copy distribution to build server ssh $(BUILD_SERVER) -- rm -rf $(REMOTE_DIST) scp -r $(DIST) $(BUILD_SERVER):$(REMOTE_DIST) diff --git a/VERSION b/VERSION index 6d7de6e..21e8796 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.0.2 +1.0.3