diff --git a/DIST/etc/init/bird4watcher.conf b/DIST/etc/init/bird4watcher.conf new file mode 100644 index 0000000..0293fff --- /dev/null +++ b/DIST/etc/init/bird4watcher.conf @@ -0,0 +1,14 @@ + +# ECIX birdwatcher + +description "birdwatcher ipv4" +author "Matthias Hannig " + +respawn +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' + diff --git a/DIST/etc/init/bird6watcher.conf b/DIST/etc/init/bird6watcher.conf new file mode 100644 index 0000000..642c095 --- /dev/null +++ b/DIST/etc/init/bird6watcher.conf @@ -0,0 +1,14 @@ + +# ECIX birdwatcher + +description "birdwatcher ipv6" +author "Matthias Hannig " + +respawn +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' + diff --git a/DIST/etc/init/birdwatcher.conf b/DIST/etc/init/birdwatcher.conf new file mode 100644 index 0000000..43b0766 --- /dev/null +++ b/DIST/etc/init/birdwatcher.conf @@ -0,0 +1,13 @@ + +# +# Birdwatcher Startup +# + +description "birdwatcher" +author "Matthias Hannig " + + +start on runlevel [2345] +stop on runlevel [!2345] + + diff --git a/Makefile b/Makefile index a26756c..c3315c6 100644 --- a/Makefile +++ b/Makefile @@ -9,7 +9,7 @@ ARCH=amd64 APP_VERSION=$(shell cat VERSION) VERSION=$(APP_VERSION)_$(shell git rev-parse --short HEAD) -BUILD_SERVER="" +BUILD_SERVER='' DIST=DIST/ REMOTE_DIST=$(PROG)-$(DIST) @@ -36,6 +36,11 @@ linux: GOARCH=$(ARCH) GOOS=linux go build -o $(PROG)-linux-$(ARCH) +build_server: +ifeq ($(BUILD_SERVER), '') + $(error BUILD_SERVER not configured) +endif + dist: clean linux mkdir -p $(DIST)opt/ecix/birdwatcher/bin @@ -62,7 +67,7 @@ rpm: dist mv $(RPM) $(LOCAL_RPMS) -remote_rpm: dist +remote_rpm: build_server dist # Copy distribution to build server ssh $(BUILD_SERVER) -- rm -rf $(REMOTE_DIST) scp -r $(DIST) $(BUILD_SERVER):$(REMOTE_DIST) @@ -73,18 +78,9 @@ remote_rpm: dist scp $(BUILD_SERVER):$(RPM) $(LOCAL_RPMS)/. -staging: linux - scp $(PROG)-linux-$(ARCH) snmp0.ber.ecix.net:. - - clean: rm -f $(PROG)-osx-$(ARCH) rm -f $(PROG)-linux-$(ARCH) rm -rf $(DIST) -build_server: -ifeq ($(BUILD_SERVER), '') - $(error BUILD_SERVER not configured) -endif -