Netdata now installs default config files in /usr

3 files changed, 5 insertions, 268 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c65ec6406b09..7b5e6047edf0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Sun Sep  9 19:17:47 UTC 2018
+# Tue Oct  2 06:58:33 UTC 2018
 pkgbase = netdata-git
 	pkgdesc = Real-time performance monitoring, in the greatest possible detail, over the web
-	pkgver = v1.10.0.r593.g5b106041
+	pkgver = v1.10.0.r752.g07060aec
 	pkgrel = 1
 	url = https://github.com/firehol/netdata/wiki
 	install = netdata.install
@@ -22,133 +22,6 @@ pkgbase = netdata-git
 	optdepends = iw: for monitoring Linux as access point
 	provides = netdata
 	conflicts = netdata
-	backup = etc/netdata/charts.d/apache.conf
-	backup = etc/netdata/charts.d/apcupsd.conf
-	backup = etc/netdata/charts.d/cpufreq.conf
-	backup = etc/netdata/charts.d/exim.conf
-	backup = etc/netdata/charts.d/libreswan.conf
-	backup = etc/netdata/charts.d/load_average.conf
-	backup = etc/netdata/charts.d/mysql.conf
-	backup = etc/netdata/charts.d/nut.conf
-	backup = etc/netdata/charts.d/phpfpm.conf
-	backup = etc/netdata/charts.d/sensors.conf
-	backup = etc/netdata/charts.d/tomcat.conf
-	backup = etc/netdata/charts.d/ap.conf
-	backup = etc/netdata/charts.d/cpu_apps.conf
-	backup = etc/netdata/charts.d/example.conf
-	backup = etc/netdata/charts.d/hddtemp.conf
-	backup = etc/netdata/charts.d/mem_apps.conf
-	backup = etc/netdata/charts.d/nginx.conf
-	backup = etc/netdata/charts.d/opensips.conf
-	backup = etc/netdata/charts.d/postfix.conf
-	backup = etc/netdata/charts.d/squid.conf
-	backup = etc/netdata/health.d/apache.conf
-	backup = etc/netdata/health.d/backend.conf
-	backup = etc/netdata/health.d/beanstalkd.conf
-	backup = etc/netdata/health.d/bind_rndc.conf
-	backup = etc/netdata/health.d/btrfs.conf
-	backup = etc/netdata/health.d/ceph.conf
-	backup = etc/netdata/health.d/cpu.conf
-	backup = etc/netdata/health.d/couchdb.conf
-	backup = etc/netdata/health.d/disks.conf
-	backup = etc/netdata/health.d/elasticsearch.conf
-	backup = etc/netdata/health.d/entropy.conf
-	backup = etc/netdata/health.d/fping.conf
-	backup = etc/netdata/health.d/fronius.conf
-	backup = etc/netdata/health.d/haproxy.conf
-	backup = etc/netdata/health.d/httpcheck.conf
-	backup = etc/netdata/health.d/ipc.conf
-	backup = etc/netdata/health.d/ipfs.conf
-	backup = etc/netdata/health.d/ipmi.conf
-	backup = etc/netdata/health.d/isc_dhcpd.conf
-	backup = etc/netdata/health.d/lighttpd.conf
-	backup = etc/netdata/health.d/mdstat.conf
-	backup = etc/netdata/health.d/memcached.conf
-	backup = etc/netdata/health.d/memory.conf
-	backup = etc/netdata/health.d/mongodb.conf
-	backup = etc/netdata/health.d/mysql.conf
-	backup = etc/netdata/health.d/named.conf
-	backup = etc/netdata/health.d/net.conf
-	backup = etc/netdata/health.d/netfilter.conf
-	backup = etc/netdata/health.d/nginx.conf
-	backup = etc/netdata/health.d/nginx_plus.conf
-	backup = etc/netdata/health.d/portcheck.conf
-	backup = etc/netdata/health.d/postgres.conf
-	backup = etc/netdata/health.d/qos.conf
-	backup = etc/netdata/health.d/ram.conf
-	backup = etc/netdata/health.d/redis.conf
-	backup = etc/netdata/health.d/retroshare.conf
-	backup = etc/netdata/health.d/softnet.conf
-	backup = etc/netdata/health.d/squid.conf
-	backup = etc/netdata/health.d/stiebeleltron.conf
-	backup = etc/netdata/health.d/swap.conf
-	backup = etc/netdata/health.d/tcp_conn.conf
-	backup = etc/netdata/health.d/tcp_listen.conf
-	backup = etc/netdata/health.d/tcp_mem.conf
-	backup = etc/netdata/health.d/tcp_orphans.conf
-	backup = etc/netdata/health.d/tcp_resets.conf
-	backup = etc/netdata/health.d/udp_errors.conf
-	backup = etc/netdata/health.d/varnish.conf
-	backup = etc/netdata/health.d/web_log.conf
-	backup = etc/netdata/health.d/zfs.conf
-	backup = etc/netdata/apps_groups.conf
-	backup = etc/netdata/charts.d.conf
-	backup = etc/netdata/python.d/apache.conf
-	backup = etc/netdata/python.d/beanstalk.conf
-	backup = etc/netdata/python.d/bind_rndc.conf
-	backup = etc/netdata/python.d/ceph.conf
-	backup = etc/netdata/python.d/chrony.conf
-	backup = etc/netdata/python.d/couchdb.conf
-	backup = etc/netdata/python.d/cpufreq.conf
-	backup = etc/netdata/python.d/dns_query_time.conf
-	backup = etc/netdata/python.d/dnsdist.conf
-	backup = etc/netdata/python.d/dovecot.conf
-	backup = etc/netdata/python.d/elasticsearch.conf
-	backup = etc/netdata/python.d/example.conf
-	backup = etc/netdata/python.d/exim.conf
-	backup = etc/netdata/python.d/fail2ban.conf
-	backup = etc/netdata/python.d/freeradius.conf
-	backup = etc/netdata/python.d/go_expvar.conf
-	backup = etc/netdata/python.d/haproxy.conf
-	backup = etc/netdata/python.d/hddtemp.conf
-	backup = etc/netdata/python.d/httpcheck.conf
-	backup = etc/netdata/python.d/icecast.conf
-	backup = etc/netdata/python.d/ipfs.conf
-	backup = etc/netdata/python.d/isc_dhcpd.conf
-	backup = etc/netdata/python.d/mdstat.conf
-	backup = etc/netdata/python.d/memcached.conf
-	backup = etc/netdata/python.d/mongodb.conf
-	backup = etc/netdata/python.d/mysql.conf
-	backup = etc/netdata/python.d/nginx.conf
-	backup = etc/netdata/python.d/nginx_plus.conf
-	backup = etc/netdata/python.d/nsd.conf
-	backup = etc/netdata/python.d/ntpd.conf
-	backup = etc/netdata/python.d/ovpn_status_log.conf
-	backup = etc/netdata/python.d/phpfpm.conf
-	backup = etc/netdata/python.d/portcheck.conf
-	backup = etc/netdata/python.d/postfix.conf
-	backup = etc/netdata/python.d/postgres.conf
-	backup = etc/netdata/python.d/powerdns.conf
-	backup = etc/netdata/python.d/rabbitmq.conf
-	backup = etc/netdata/python.d/redis.conf
-	backup = etc/netdata/python.d/retroshare.conf
-	backup = etc/netdata/python.d/samba.conf
-	backup = etc/netdata/python.d/sensors.conf
-	backup = etc/netdata/python.d/springboot.conf
-	backup = etc/netdata/python.d/squid.conf
-	backup = etc/netdata/python.d/smartd_log.conf
-	backup = etc/netdata/python.d/tomcat.conf
-	backup = etc/netdata/python.d/traefik.conf
-	backup = etc/netdata/python.d/varnish.conf
-	backup = etc/netdata/python.d/web_log.conf
-	backup = etc/netdata/fping.conf
-	backup = etc/netdata/node.d.conf
-	backup = etc/netdata/python.d.conf
-	backup = etc/netdata/health_alarm_notify.conf
-	backup = etc/netdata/health_email_recipients.conf
-	backup = etc/netdata/stream.conf
-	backup = etc/netdata/statsd.d/example.conf
-	backup = etc/netdata/netdata.conf
 	source = netdata::git+https://github.com/firehol/netdata
 	source = netdata.tmpfiles
 	source = netdata.sysusers
diff --git a/PKGBUILD b/PKGBUILD
index 15c32c90b527..b8fea52eb468 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=netdata-git
 _gitname=netdata
-pkgver=v1.10.0.r593.g5b106041
+pkgver=v1.10.0.r752.g07060aec
 pkgrel=1
 pkgdesc="Real-time performance monitoring, in the greatest possible detail, over the web"
 url="https://github.com/firehol/netdata/wiki"
@@ -57,7 +57,8 @@ package() {
 
   # Remove /var/*, pacman creates it via tmpfiles hook
   rm -vrf "${pkgdir}/var"
-  touch "$pkgdir/etc/netdata/netdata.conf"
+
+  mkdir -p "$pkgdir/etc/netdata"
   chown -R 134:134 "$pkgdir"/etc/netdata
   chown -R 134:134 "$pkgdir"/usr/share/netdata/web
 
@@ -67,132 +68,3 @@ package() {
   install -Dm0644 "${srcdir}/${_gitname}.sysusers" "${pkgdir}/usr/lib/sysusers.d/${_gitname}.conf"
 }
 
-backup=(
-  etc/netdata/charts.d/apache.conf
-  etc/netdata/charts.d/apcupsd.conf
-  etc/netdata/charts.d/cpufreq.conf
-  etc/netdata/charts.d/exim.conf
-  etc/netdata/charts.d/libreswan.conf
-  etc/netdata/charts.d/load_average.conf
-  etc/netdata/charts.d/mysql.conf
-  etc/netdata/charts.d/nut.conf
-  etc/netdata/charts.d/phpfpm.conf
-  etc/netdata/charts.d/sensors.conf
-  etc/netdata/charts.d/tomcat.conf
-  etc/netdata/charts.d/ap.conf
-  etc/netdata/charts.d/cpu_apps.conf
-  etc/netdata/charts.d/example.conf
-  etc/netdata/charts.d/hddtemp.conf
-  etc/netdata/charts.d/mem_apps.conf
-  etc/netdata/charts.d/nginx.conf
-  etc/netdata/charts.d/opensips.conf
-  etc/netdata/charts.d/postfix.conf
-  etc/netdata/charts.d/squid.conf
-  etc/netdata/health.d/apache.conf
-  etc/netdata/health.d/backend.conf
-  etc/netdata/health.d/beanstalkd.conf
-  etc/netdata/health.d/bind_rndc.conf
-  etc/netdata/health.d/btrfs.conf
-  etc/netdata/health.d/ceph.conf
-  etc/netdata/health.d/cpu.conf
-  etc/netdata/health.d/couchdb.conf
-  etc/netdata/health.d/disks.conf
-  etc/netdata/health.d/elasticsearch.conf
-  etc/netdata/health.d/entropy.conf
-  etc/netdata/health.d/fping.conf
-  etc/netdata/health.d/fronius.conf
-  etc/netdata/health.d/haproxy.conf
-  etc/netdata/health.d/httpcheck.conf
-  etc/netdata/health.d/ipc.conf
-  etc/netdata/health.d/ipfs.conf
-  etc/netdata/health.d/ipmi.conf
-  etc/netdata/health.d/isc_dhcpd.conf
-  etc/netdata/health.d/lighttpd.conf
-  etc/netdata/health.d/mdstat.conf
-  etc/netdata/health.d/memcached.conf
-  etc/netdata/health.d/memory.conf
-  etc/netdata/health.d/mongodb.conf
-  etc/netdata/health.d/mysql.conf
-  etc/netdata/health.d/named.conf
-  etc/netdata/health.d/net.conf
-  etc/netdata/health.d/netfilter.conf
-  etc/netdata/health.d/nginx.conf
-  etc/netdata/health.d/nginx_plus.conf
-  etc/netdata/health.d/portcheck.conf
-  etc/netdata/health.d/postgres.conf
-  etc/netdata/health.d/qos.conf
-  etc/netdata/health.d/ram.conf
-  etc/netdata/health.d/redis.conf
-  etc/netdata/health.d/retroshare.conf
-  etc/netdata/health.d/softnet.conf
-  etc/netdata/health.d/squid.conf
-  etc/netdata/health.d/stiebeleltron.conf
-  etc/netdata/health.d/swap.conf
-  etc/netdata/health.d/tcp_conn.conf
-  etc/netdata/health.d/tcp_listen.conf
-  etc/netdata/health.d/tcp_mem.conf
-  etc/netdata/health.d/tcp_orphans.conf
-  etc/netdata/health.d/tcp_resets.conf
-  etc/netdata/health.d/udp_errors.conf
-  etc/netdata/health.d/varnish.conf
-  etc/netdata/health.d/web_log.conf
-  etc/netdata/health.d/zfs.conf
-  etc/netdata/apps_groups.conf
-  etc/netdata/charts.d.conf
-  etc/netdata/python.d/apache.conf
-  etc/netdata/python.d/beanstalk.conf
-  etc/netdata/python.d/bind_rndc.conf
-  etc/netdata/python.d/ceph.conf
-  etc/netdata/python.d/chrony.conf
-  etc/netdata/python.d/couchdb.conf
-  etc/netdata/python.d/cpufreq.conf
-  etc/netdata/python.d/dns_query_time.conf
-  etc/netdata/python.d/dnsdist.conf
-  etc/netdata/python.d/dovecot.conf
-  etc/netdata/python.d/elasticsearch.conf
-  etc/netdata/python.d/example.conf
-  etc/netdata/python.d/exim.conf
-  etc/netdata/python.d/fail2ban.conf
-  etc/netdata/python.d/freeradius.conf
-  etc/netdata/python.d/go_expvar.conf
-  etc/netdata/python.d/haproxy.conf
-  etc/netdata/python.d/hddtemp.conf
-  etc/netdata/python.d/httpcheck.conf
-  etc/netdata/python.d/icecast.conf
-  etc/netdata/python.d/ipfs.conf
-  etc/netdata/python.d/isc_dhcpd.conf
-  etc/netdata/python.d/mdstat.conf
-  etc/netdata/python.d/memcached.conf
-  etc/netdata/python.d/mongodb.conf
-  etc/netdata/python.d/mysql.conf
-  etc/netdata/python.d/nginx.conf
-  etc/netdata/python.d/nginx_plus.conf
-  etc/netdata/python.d/nsd.conf
-  etc/netdata/python.d/ntpd.conf
-  etc/netdata/python.d/ovpn_status_log.conf
-  etc/netdata/python.d/phpfpm.conf
-  etc/netdata/python.d/portcheck.conf
-  etc/netdata/python.d/postfix.conf
-  etc/netdata/python.d/postgres.conf
-  etc/netdata/python.d/powerdns.conf
-  etc/netdata/python.d/rabbitmq.conf
-  etc/netdata/python.d/redis.conf
-  etc/netdata/python.d/retroshare.conf
-  etc/netdata/python.d/samba.conf
-  etc/netdata/python.d/sensors.conf
-  etc/netdata/python.d/springboot.conf
-  etc/netdata/python.d/squid.conf
-  etc/netdata/python.d/smartd_log.conf
-  etc/netdata/python.d/tomcat.conf
-  etc/netdata/python.d/traefik.conf
-  etc/netdata/python.d/varnish.conf
-  etc/netdata/python.d/web_log.conf
-  etc/netdata/fping.conf
-  etc/netdata/node.d.conf
-  etc/netdata/python.d.conf
-  etc/netdata/health_alarm_notify.conf
-  etc/netdata/health_email_recipients.conf
-  etc/netdata/stream.conf
-  etc/netdata/statsd.d/example.conf
-  etc/netdata/netdata.conf
-)
diff --git a/netdata.install b/netdata.install
index ada66ae3be52..5386ee99e649 100644
--- a/netdata.install
+++ b/netdata.install
@@ -5,14 +5,6 @@ setcap_netdata() {
 
 post_install() {
 	setcap_netdata
-
-	echo
-	echo "After the daemon has been started for the first time,"
-	echo "download the default config file from"
-	echo "http://127.0.0.1:19999/netdata.conf"
-	echo
-	echo "Copy it to /etc/netdata/ and modify it."
-	echo
 }
 
 post_upgrade() {