Mirrors
/
birdwatcher
mirror of https://github.com/alice-lg/birdwatcher.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Conclude de-ecixification

This commit is contained in:
Benedikt Rudolph 2018-07-20 15:08:34 +02:00
parent 821a4f869a
commit ac1c385048
7 changed files with 21 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
LICENSE
View File

@ -1,6 +1,6 @@
BSD 3-Clause License BSD 3-Clause License
Copyright (c) 2016, ECIX Copyright (c) 2016, ECIX, DE-CIX
All rights reserved. All rights reserved.
Redistribution and use in source and binary forms, with or without Redistribution and use in source and binary forms, with or without

18
Makefile
View File

@ -1,5 +1,5 @@
# #
# Ecix Birdseye Makefile # Birdseye Makefile
# #
PROG=birdwatcher PROG=birdwatcher
@ -44,8 +44,8 @@ endif
dist: clean linux dist: clean linux
mkdir -p $(DIST)opt/ecix/birdwatcher/bin mkdir -p $(DIST)opt/birdwatcher/birdwatcher/bin
mkdir -p $(DIST)etc/ecix mkdir -p $(DIST)etc/birdwatcher
ifeq ($(SYSTEM_INIT), systemd) ifeq ($(SYSTEM_INIT), systemd)
# Installing systemd services # Installing systemd services
@ -59,11 +59,11 @@ endif
# Copy config and startup script # Copy config and startup script
cp etc/ecix/* DIST/etc/ecix/. cp etc/birdwatcher/* DIST/etc/birdwatcher/.
rm -f DIST/etc/ecix/*.local.* rm -f DIST/etc/birdwatcher/*.local.*
# Copy bin # Copy bin
cp $(PROG)-linux-$(ARCH) DIST/opt/ecix/birdwatcher/bin/. cp $(PROG)-linux-$(ARCH) DIST/opt/birdwatcher/birdwatcher/bin/.
release: linux release: linux
@ -71,7 +71,7 @@ release: linux
mkdir -p ../birdseye-static/birdwatcher-builds/$(APP_VERSION)/ mkdir -p ../birdseye-static/birdwatcher-builds/$(APP_VERSION)/
cp birdwatcher-linux-amd64 ../birdseye-static/birdwatcher-builds/$(APP_VERSION)/ cp birdwatcher-linux-amd64 ../birdseye-static/birdwatcher-builds/$(APP_VERSION)/
rm -f ../birdseye-static/birdwatcher-builds/latest rm -f ../birdseye-static/birdwatcher-builds/latest
cd ../birdseye-static/birdwatcher-builds && ln -s $(APP_VERSION) latest cd ../birdseye-static/birdwatcher-builds && ln -s $(APP_VERSION) latest
rpm: dist rpm: dist
@ -81,7 +81,7 @@ rpm: dist
# Create RPM from dist # Create RPM from dist
fpm -s dir -t rpm -n $(PROG) -v $(VERSION) -C $(DIST) \ fpm -s dir -t rpm -n $(PROG) -v $(VERSION) -C $(DIST) \
--config-files /etc/ecix/birdwatcher.conf \ --config-files /etc/birdwatcher/birdwatcher.conf \
opt/ etc/ opt/ etc/
mv $(RPM) $(LOCAL_RPMS) mv $(RPM) $(LOCAL_RPMS)
@ -95,7 +95,7 @@ remote_rpm: build_server dist
ssh $(BUILD_SERVER) -- rm -rf $(REMOTE_DIST) ssh $(BUILD_SERVER) -- rm -rf $(REMOTE_DIST)
scp -r $(DIST) $(BUILD_SERVER):$(REMOTE_DIST) scp -r $(DIST) $(BUILD_SERVER):$(REMOTE_DIST)
ssh $(BUILD_SERVER) -- fpm -s dir -t rpm -n $(PROG) -v $(VERSION) -C $(REMOTE_DIST) \ ssh $(BUILD_SERVER) -- fpm -s dir -t rpm -n $(PROG) -v $(VERSION) -C $(REMOTE_DIST) \
--config-files /etc/ecix/birdwatcher.conf \ --config-files /etc/birdwatcher/birdwatcher.conf \
opt/ etc/ opt/ etc/
# Get rpm from server # Get rpm from server

6
config_test.go
View File

@ -7,9 +7,9 @@ import (
func TestLoadConfigs(t *testing.T) { func TestLoadConfigs(t *testing.T) {
t.Log("Loading configs") t.Log("Loading configs")
res, err := LoadConfigs([]string{ res, err := LoadConfigs([]string{
"./etc/ecix/birdwatcher.conf", "./etc/birdwatcher/birdwatcher.conf",
"/etc/ecix/birdwatcher.conf", "/etc/birdwatcher/birdwatcher.conf",
"./etc/ecix/birdwatcher.local.conf", "./etc/birdwatcher/birdwatcher.local.conf",
}) })
t.Log(res) t.Log(res)

4
install/systemd/birdwatcher4.service
View File

@ -1,11 +1,11 @@
[Unit] [Unit]
Description=BIRDwatcher IPv4 Description=BIRDwatcher IPv4
Wants=network.target Wants=network.target
After=network.target After=network.target
[Service] [Service]
Type=simple Type=simple
ExecStart=/opt/ecix/birdwatcher/bin/birdwatcher-linux-amd64 ExecStart=/opt/birdwatcher/birdwatcher/bin/birdwatcher-linux-amd64
[Install] [Install]
WantedBy=multi-user.target WantedBy=multi-user.target

4
install/systemd/birdwatcher6.service
View File

@ -1,11 +1,11 @@
[Unit] [Unit]
Description=BIRDwatcher IPv6 Description=BIRDwatcher IPv6
Wants=network.target Wants=network.target
After=network.target After=network.target
[Service] [Service]
Type=simple Type=simple
ExecStart=/opt/ecix/birdwatcher/bin/birdwatcher-linux-amd64 -6 ExecStart=/opt/birdwatcher/birdwatcher/bin/birdwatcher-linux-amd64 -6
[Install] [Install]
WantedBy=multi-user.target WantedBy=multi-user.target

5
install/upstart/init/bird4watcher.conf
View File

@ -1,5 +1,5 @@
# ECIX birdwatcher # birdwatcher
description "birdwatcher ipv4" description "birdwatcher ipv4"
author "Matthias Hannig <mha@ecix.net>" author "Matthias Hannig <mha@ecix.net>"
@ -10,5 +10,4 @@ respawn limit 20 10
start on starting birdwatcher start on starting birdwatcher
stop on stopping birdwatcher stop on stopping birdwatcher
exec /opt/ecix/birdwatcher/bin/birdwatcher-linux-amd64 2>&1 | logger -i -t 'BIRD4 WATCHER' exec /opt/birdwatcher/birdwatcher/bin/birdwatcher-linux-amd64 2>&1 | logger -i -t 'BIRD4 WATCHER'

5
install/upstart/init/bird6watcher.conf
View File

@ -1,5 +1,5 @@
# ECIX birdwatcher # birdwatcher
description "birdwatcher ipv6" description "birdwatcher ipv6"
author "Matthias Hannig <mha@ecix.net>" author "Matthias Hannig <mha@ecix.net>"
@ -10,5 +10,4 @@ respawn limit 20 10
start on starting birdwatcher start on starting birdwatcher
stop on stopping birdwatcher stop on stopping birdwatcher
exec /opt/ecix/birdwatcher/bin/birdwatcher-linux-amd64 -6 2>&1 | logger -i -t 'BIRD6 WATCHER' exec /opt/birdwatcher/birdwatcher/bin/birdwatcher-linux-amd64 -6 2>&1 | logger -i -t 'BIRD6 WATCHER'