Mirrors/birdwatcher
1
0
Fork 0
mirror of https://github.com/alice-lg/birdwatcher.git synced 2025-03-09 00:00:05 +01:00
Code Issues Releases Wiki Activity

Conclude de-ecixification

Browse source
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
Copyright (c) 2016, ECIX
Copyright (c) 2016, ECIX, DE-CIX
All rights reserved.
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
@ -44,8 +44,8 @@ endif
dist: clean linux
mkdir -p $(DIST)opt/ecix/birdwatcher/bin
mkdir -p $(DIST)etc/ecix
mkdir -p $(DIST)opt/birdwatcher/birdwatcher/bin
mkdir -p $(DIST)etc/birdwatcher
ifeq ($(SYSTEM_INIT), systemd)
# Installing systemd services
@ -59,11 +59,11 @@ endif
# Copy config and startup script
cp etc/ecix/* DIST/etc/ecix/.
rm -f DIST/etc/ecix/*.local.*
cp etc/birdwatcher/* DIST/etc/birdwatcher/.
rm -f DIST/etc/birdwatcher/*.local.*
# Copy bin
cp $(PROG)-linux-$(ARCH) DIST/opt/ecix/birdwatcher/bin/.
cp $(PROG)-linux-$(ARCH) DIST/opt/birdwatcher/birdwatcher/bin/.
release: linux
@ -71,7 +71,7 @@ release: linux
mkdir -p ../birdseye-static/birdwatcher-builds/$(APP_VERSION)/
cp birdwatcher-linux-amd64 ../birdseye-static/birdwatcher-builds/$(APP_VERSION)/
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
@ -81,7 +81,7 @@ rpm: dist
# Create RPM from 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/
mv $(RPM) $(LOCAL_RPMS)
@ -95,7 +95,7 @@ remote_rpm: build_server dist
ssh $(BUILD_SERVER) -- rm -rf $(REMOTE_DIST)
scp -r $(DIST) $(BUILD_SERVER):$(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/
# Get rpm from server

6
config_test.go
View file

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

4
install/systemd/birdwatcher4.service
View file

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

4
install/systemd/birdwatcher6.service
View file

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

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

@ -1,5 +1,5 @@
# ECIX birdwatcher
# birdwatcher
description "birdwatcher ipv4"
author "Matthias Hannig <mha@ecix.net>"
@ -10,5 +10,4 @@ respawn limit 20 10
start on starting 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"
author "Matthias Hannig <mha@ecix.net>"
@ -10,5 +10,4 @@ respawn limit 20 10
start on starting 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'