diff options
| author | Petter Reinholdtsen <pere@hungry.com> | 2006-08-24 09:31:01 +0000 |
|---|---|---|
| committer | Petter Reinholdtsen <pere@hungry.com> | 2006-08-24 09:31:01 +0000 |
| commit | 151059c514ce5e9eabbc27a6893528348d7bc6fd (patch) | |
| tree | 637d18deae8973721b030990bd0eed5f04d78034 | |
| parent | 6c9cdf665dcf2df024a9d5b1fdd7f22d7d17c0db (diff) | |
| download | sitesummary-151059c514ce5e9eabbc27a6893528348d7bc6fd.tar.gz sitesummary-151059c514ce5e9eabbc27a6893528348d7bc6fd.tar.bz2 sitesummary-151059c514ce5e9eabbc27a6893528348d7bc6fd.tar.xz | |
Move default config into separate file.
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | sitesummary-client | 5 | ||||
| -rw-r--r-- | sitesummary-client.conf | 3 |
3 files changed, 6 insertions, 4 deletions
@@ -5,6 +5,7 @@ sbindir = $(prefix)/sbin datadir = $(prefix)/share cgibindir = $(libdir)/cgi-bin libdir = $(prefix)/lib +pkgdatadir = $(datadir)/sitesummary collectordir = $(libdir)/sitesummary/collect.d INSTALL = install @@ -25,6 +26,7 @@ install-server: install-client: $(INSTALL) -d $(DESTDIR)$(sbindir) $(INSTALL) sitesummary-client $(DESTDIR)$(sbindir) + $(INSTALL) sitesummary-client.conf $(DESTDIR)$(pkgdatadir)/config $(INSTALL) -d $(DESTDIR)$(collectordir) for collector in $(COLLECTORS) ; do \ diff --git a/sitesummary-client b/sitesummary-client index 0cf2438..144bf79 100644 --- a/sitesummary-client +++ b/sitesummary-client @@ -7,10 +7,6 @@ set -e -serverurls="http://localhost/cgi-bin/sitesummary-collector.cgi" -fragdirs="/usr/lib/sitesummary/collect.d \ - /etc/sitesummary/collect.d" - # Make sure to store files in a ramfs backed # storage area on diskless clients, so use /tmp/. tmpdir=/tmp/sitesummary-$$ @@ -23,6 +19,7 @@ log() { # Check or get GPG key, return false if it is unavailable get_gpg_key_if_missing() { + url="$1" true } gpg_encrypt_for_url() { diff --git a/sitesummary-client.conf b/sitesummary-client.conf new file mode 100644 index 0000000..2eabc40 --- /dev/null +++ b/sitesummary-client.conf @@ -0,0 +1,3 @@ +serverurls="http://localhost/cgi-bin/sitesummary-collector.cgi" +fragdirs="/usr/lib/sitesummary/collect.d \ + /etc/sitesummary/collect.d" |