From 9b20bcba2f47461e81f2fb5d1bfc80e35c8fc183 Mon Sep 17 00:00:00 2001 From: cyanide-burnout Date: Wed, 3 Aug 2016 12:40:27 +0400 Subject: [PATCH] Fixes in package files --- Makefile | 11 ++++++++--- OpenWRT/config/cronosagent | 2 +- cronosagent.conf | 2 +- debian/conffiles | 2 +- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 2cefc32..5d7e3d6 100644 --- a/Makefile +++ b/Makefile @@ -43,10 +43,15 @@ install: install -D -d $(PREFIX) install -o root -g root cronosagent $(PREFIX) install -o root -g root cronosagent.sh $(PREFIX) - # install -o root -g root cronosagent-init $(PREFIX) - # install -m 644 -o root -g root cronosagent-monit $(PREFIX) - # install -m 644 -o root -g root cronosagent.plist $(PREFIX) + install -o root -g root cronosagent.conf $(PREFIX) +ifeq ($(OS), Linux) + install -o root -g root cronosagent-init $(PREFIX) + install -m 644 -o root -g root cronosagent-monit $(PREFIX) install -m 644 -o root -g root cronosagent.service $(PREFIX) +endif +ifeq ($(OS), Darwin) + install -m 644 -o root -g root cronosagent.plist $(DESTDIR)/Library/LaunchDaemons +endif clean: rm -f $(PREREQUISITES) $(OBJECTS) cronosagent diff --git a/OpenWRT/config/cronosagent b/OpenWRT/config/cronosagent index 0a838ee..3bdb4c9 100644 --- a/OpenWRT/config/cronosagent +++ b/OpenWRT/config/cronosagent @@ -1,5 +1,5 @@ config cronosagent option number '123456' - option repeaterAddress '1.1.1.1' + option repeaterAddress '172.33.20.130' option serverAddress 'master.dstar.su' option serverPassword 'password' diff --git a/cronosagent.conf b/cronosagent.conf index 363dca6..0041760 100644 --- a/cronosagent.conf +++ b/cronosagent.conf @@ -1,6 +1,6 @@ REPEATER_NUMBER=123456 -REPEATER_ADDRESS=172.33.20.136 +REPEATER_ADDRESS=172.33.20.130 SERVER_ADDRESS=master.dstar.su SERVER_PASSWORD=passw0rd SERVICE_MODE=1 diff --git a/debian/conffiles b/debian/conffiles index bf522cc..23db0a8 100644 --- a/debian/conffiles +++ b/debian/conffiles @@ -1 +1 @@ -/opt/CronosAgent/cronosagent.sh +/opt/CronosAgent/cronosagent.conf