diff options
| -rw-r--r-- | debian/rhnop-client.install | 4 | ||||
| -rw-r--r-- | debian/rhnop-client.nopsyncd-master.service (renamed from debian/rhnop-client.nopcollectd-master.service) | 2 | ||||
| -rw-r--r-- | debian/rhnop-client.nopsyncd-standby.service (renamed from debian/rhnop-client.nopcollectd-standby.service) | 2 | ||||
| -rwxr-xr-x | debian/rules | 4 | ||||
| -rw-r--r-- | src/Makefile | 10 | ||||
| -rw-r--r-- | src/db.lua | 4 | ||||
| -rwxr-xr-x | src/nopsyncd (renamed from src/nopcollectd) | 2 | ||||
| -rw-r--r-- | src/nopsyncd.master.conf (renamed from src/nopcollectd.master.conf) | 4 | ||||
| -rw-r--r-- | src/nopsyncd.standby.conf (renamed from src/nopcollectd.standby.conf) | 4 | ||||
| -rw-r--r-- | src/playlog.lua | 2 |
10 files changed, 19 insertions, 19 deletions
diff --git a/debian/rhnop-client.install b/debian/rhnop-client.install index 6b9cf7e..bd78579 100644 --- a/debian/rhnop-client.install +++ b/debian/rhnop-client.install @@ -1,5 +1,5 @@ -usr/bin/nopcollectd +usr/bin/nopsyncd usr/bin/nopsysstated -etc/rhnop/nopcollectd.*.conf +etc/rhnop/nopsyncd.*.conf etc/rhnop/nopsysstated.conf usr/share/rhnop/db.lua diff --git a/debian/rhnop-client.nopcollectd-master.service b/debian/rhnop-client.nopsyncd-master.service index 12b8905..051d817 100644 --- a/debian/rhnop-client.nopcollectd-master.service +++ b/debian/rhnop-client.nopsyncd-master.service @@ -2,7 +2,7 @@ Description=Radio Helsinki Now Playing Daemon (Client: Master) [Service] -ExecStart=/usr/bin/nopcollectd master +ExecStart=/usr/bin/nopsyncd master Restart=on-failure PrivateTmp=yes PrivateDevices=yes diff --git a/debian/rhnop-client.nopcollectd-standby.service b/debian/rhnop-client.nopsyncd-standby.service index 251f09b..64518c2 100644 --- a/debian/rhnop-client.nopcollectd-standby.service +++ b/debian/rhnop-client.nopsyncd-standby.service @@ -2,7 +2,7 @@ Description=Radio Helsinki Now Playing Daemon (Client: Standby) [Service] -ExecStart=/usr/bin/nopcollectd standby +ExecStart=/usr/bin/nopsyncd standby Restart=on-failure PrivateTmp=yes PrivateDevices=yes diff --git a/debian/rules b/debian/rules index d82394a..35cc3c8 100755 --- a/debian/rules +++ b/debian/rules @@ -8,5 +8,5 @@ override_dh_auto_configure: override_dh_systemd_enable: dh_systemd_enable --name=nopfetchd nopfetchd.service dh_systemd_enable --name=nopsysstated nopsysstated.service - dh_systemd_enable --name=nopcollectd-master nopcollectd-master.service - dh_systemd_enable --name=nopcollectd-standby nopcollectd-standby.service + dh_systemd_enable --name=nopsyncd-master nopsyncd-master.service + dh_systemd_enable --name=nopsyncd-standby nopsyncd-standby.service diff --git a/src/Makefile b/src/Makefile index b478018..f71d8a0 100644 --- a/src/Makefile +++ b/src/Makefile @@ -75,9 +75,9 @@ install-bin: $(EXECUTABLE) $(INSTALL) -d $(DESTDIR)$(BINDIR) $(INSTALL) -m 755 $(EXECUTABLE) $(DESTDIR)$(BINDIR) $(INSTALL) -m 755 noprml $(DESTDIR)$(BINDIR) - $(INSTALL) -m 755 nopcollectd $(DESTDIR)$(BINDIR) - $(SED) -e 's#_rhnopescdir_#$(ETCDIR)/rhnop#' -i $(DESTDIR)$(BINDIR)/nopcollectd - $(SED) -e 's#_rhnoplibdir_/?.lua#$(DATAROOTDIR)/rhnop/?.lua#' -i $(DESTDIR)$(BINDIR)/nopcollectd + $(INSTALL) -m 755 nopsyncd $(DESTDIR)$(BINDIR) + $(SED) -e 's#_rhnopescdir_#$(ETCDIR)/rhnop#' -i $(DESTDIR)$(BINDIR)/nopsyncd + $(SED) -e 's#_rhnoplibdir_/?.lua#$(DATAROOTDIR)/rhnop/?.lua#' -i $(DESTDIR)$(BINDIR)/nopsyncd $(INSTALL) -m 755 nopsysstated $(DESTDIR)$(BINDIR) $(SED) -e 's#_rhnopescdir_#$(ETCDIR)/rhnop#' -i $(DESTDIR)$(BINDIR)/nopsysstated $(SED) -e 's#_rhnoplibdir_/?.lua#$(DATAROOTDIR)/rhnop/?.lua#' -i $(DESTDIR)$(BINDIR)/nopsysstated @@ -94,7 +94,7 @@ install-lib: install-etc: $(INSTALL) -d $(DESTDIR)$(ETCDIR)/rhnop $(INSTALL) -m 640 nopfetchd.conf $(DESTDIR)$(ETCDIR)/rhnop - $(INSTALL) -m 640 nopcollectd.*.conf $(DESTDIR)$(ETCDIR)/rhnop + $(INSTALL) -m 640 nopsyncd.*.conf $(DESTDIR)$(ETCDIR)/rhnop $(INSTALL) -m 640 nopsysstated.conf $(DESTDIR)$(ETCDIR)/rhnop uninstall: remove @@ -104,7 +104,7 @@ remove: $(REMOVE_TARGETS) remove-bin: rm -f $(DESTDIR)$(BINDIR)/$(EXECUTABLE) rm -f $(DESTDIR)$(BINDIR)/noprml - rm -f $(DESTDIR)$(BINDIR)/nopcollectd + rm -f $(DESTDIR)$(BINDIR)/nopsyncd rm -f $(DESTDIR)$(BINDIR)/nopsysstated remove-lib: @@ -23,8 +23,8 @@ luasql = require "luasql.mysql" -- for destination database -- CREATE DATABASE nop CHARACTER SET utf8 COLLATE utf8_unicode_ci; --- GRANT select,insert,update,delete ON nop.master TO 'nopcollectd'@'localhost' IDENTIFIED BY '<password>'; --- GRANT select,insert,update,delete ON nop.standby TO 'nopcollectd'@'localhost'; +-- GRANT select,insert,update,delete ON nop.master TO 'nopsyncd'@'localhost' IDENTIFIED BY '<password>'; +-- GRANT select,insert,update,delete ON nop.standby TO 'nopsyncd'@'localhost'; -- GRANT select,insert,update ON nop.state TO 'nopsysstated'@'localhost' IDENTIFIED BY '<password>'; -- GRANT select ON nop.* TO 'nop'@'localhost' IDENTIFIED BY '<password>'; -- USE nop diff --git a/src/nopcollectd b/src/nopsyncd index d02e6f0..f67f2c4 100755 --- a/src/nopcollectd +++ b/src/nopsyncd @@ -31,7 +31,7 @@ if #arg < 1 then os.exit(1) end -local cnf = conf.load("_rhnopescdir_/nopcollectd." .. arg[1] .. ".conf") +local cnf = conf.load("_rhnopescdir_/nopsyncd." .. arg[1] .. ".conf") src_db = assert(db.init(cnf.src_db, cnf.src_user, cnf.src_pwd, cnf.src_host, cnf.src_port, cnf.src_table)) dst_db = assert(db.init(cnf.dst_db, cnf.dst_user, cnf.dst_pwd, cnf.dst_host, cnf.dst_port, cnf.dst_table)) diff --git a/src/nopcollectd.master.conf b/src/nopsyncd.master.conf index 5d61551..35e6ebc 100644 --- a/src/nopcollectd.master.conf +++ b/src/nopsyncd.master.conf @@ -5,12 +5,12 @@ src_db=rhnop src_table=now src_host=airplay.helsinki.at #src_port=3306 -src_user=nopcollectd +src_user=nopsyncd src_pwd=123456 dst_db=nop dst_table=master dst_host=127.0.0.1 #dst_port=3306 -dst_user=nopcollectd +dst_user=nopsyncd dst_pwd=123456 diff --git a/src/nopcollectd.standby.conf b/src/nopsyncd.standby.conf index 92ba1aa..62da2a3 100644 --- a/src/nopcollectd.standby.conf +++ b/src/nopsyncd.standby.conf @@ -5,12 +5,12 @@ src_db=rhnop src_table=now src_host=airplay2.helsinki.at #src_port=3306 -src_user=nopcollectd +src_user=nopsyncd src_pwd=123456 dst_db=nop dst_table=standby dst_host=127.0.0.1 #dst_port=3306 -dst_user=nopcollectd +dst_user=nopsyncd dst_pwd=123456 diff --git a/src/playlog.lua b/src/playlog.lua index 1dea4e9..5f97850 100644 --- a/src/playlog.lua +++ b/src/playlog.lua @@ -23,7 +23,7 @@ luasql = require "luasql.mysql" -- CREATE DATABASE rhnop CHARACTER SET utf8 COLLATE utf8_unicode_ci; -- GRANT select,insert,update ON rhnop.* TO 'nopfetchd' IDENTIFIED BY '<password>'; --- GRANT select ON rhnop.* TO 'nopcollectd' IDENTIFIED BY '<password>'; +-- GRANT select ON rhnop.* TO 'nopsyncd' IDENTIFIED BY '<password>'; -- USE rhnop -- CREATE TABLE IF NOT EXISTS now (timestamp BIGINT UNSIGNED PRIMARY KEY NOT NULL, cart INT NOT NULL, len INT, showtitle VARCHAR(255), title VARCHAR(255), artist VARCHAR(255), album VARCHAR(255), ismusic BOOLEAN); -- ALTER TABLE now CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci; |