diff -Naupr netdata_orig/netdata.install netdata/netdata.install --- netdata_orig/netdata.install 2017-01-28 05:37:54.000000000 +0700 +++ netdata/netdata.install 2017-01-29 20:03:26.210166257 +0700 @@ -1,26 +1,16 @@ -chown_netdata() { - chown -R netdata:netdata /var/lib/netdata - chown -R netdata:netdata /var/log/netdata - chown -R netdata:netdata /var/cache/netdata - chown -R netdata:netdata /usr/share/netdata/web - chown -R netdata:netdata /etc/netdata +setcap_netdata() { + #https://github.com/firehol/netdata/wiki/Apps-Plugin#apps-plugin-is-missing-information + setcap cap_dac_read_search,cap_sys_ptrace+ep /usr/lib/netdata/plugins.d/apps.plugin || chmod 1755 /usr/lib/netdata/plugins.d/apps.plugin } post_install() { - getent group netdata > /dev/null || groupadd -g 134 netdata 1>/dev/null - getent passwd netdata > /dev/null || useradd -u 134 -d /var/cache/netdata -g netdata -s /bin/nologin netdata 1>/dev/null - - chown_netdata + 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_remove() { + userdel netdata > /dev/null } post_upgrade() { - chown_netdata + setcap_netdata } diff -Naupr netdata_orig/netdata.sysusers netdata/netdata.sysusers --- netdata_orig/netdata.sysusers 1970-01-01 07:00:00.000000000 +0700 +++ netdata/netdata.sysusers 2017-01-28 14:02:08.000000000 +0700 @@ -0,0 +1 @@ +u netdata 134 - /var/cache/netdata diff -Naupr netdata_orig/netdata.tmpfiles netdata/netdata.tmpfiles --- netdata_orig/netdata.tmpfiles 1970-01-01 07:00:00.000000000 +0700 +++ netdata/netdata.tmpfiles 2017-01-29 21:12:36.249790931 +0700 @@ -0,0 +1,3 @@ +d /var/lib/netdata 0750 netdata netdata +d /var/log/netdata 0750 netdata netdata +d /var/cache/netdata 0750 netdata netdata diff -Naupr netdata_orig/PKGBUILD netdata/PKGBUILD --- netdata_orig/PKGBUILD 2017-01-28 05:37:54.000000000 +0700 +++ netdata/PKGBUILD 2017-01-29 21:38:55.863801473 +0700 @@ -1,42 +1,67 @@ # Maintainer: Sven-Hendrik Haase # Contributor: SanskritFritz (gmail) +# Contributor: Konstantin Shalygin -pkgname=netdata -pkgver=1.5.0 -pkgrel=1 +pkgname='netdata' +pkgver='1.5.0' +pkgrel='2' pkgdesc="Real-time performance monitoring, in the greatest possible detail, over the web." -url="https://github.com/firehol/netdata/wiki" +url="https://github.com/firehol/netdata" arch=('i686' 'x86_64') license=('GPL') depends=('libmnl' 'libnetfilter_acct' 'zlib') -optdepends=('nodejs: Webbox plugin' - 'lm_sensors: sensors module') -backup=('etc/netdata/netdata.conf' 'etc/netdata/charts.d.conf' 'etc/netdata/apps_groups.conf') -install="$pkgname.install" -source=("https://github.com/firehol/netdata/releases/download/v1.5.0/netdata-1.5.0.tar.xz") -sha512sums=('523300e942096040457ee6442bdbc28509784e098d80b0321537c40f350e8428d06512c848810d5c7ca0b4f1b2d29d0ee03eec23be32f444b63c2ec8cb227a94') +optdepends=('nodejs: for monitoring named and SNMP devices' + 'lm_sensors: for monitoring hardware sensors' + 'iproute2: for monitoring Linux QoS' + 'python: for most of the external plugins' + 'python-psycopg2: for monitoring PostgreSQL databases' + 'python-mysqldb: for monitoring mysql databases' + 'python-requests: for monitoring elasticsearch' + 'hddtemp: for monitoring hhd temperature' + 'network-ups-tools: for monitoring UPS' + 'apcupsd: for monitoring APC UPS' + 'iw: for monitoring Linux as access point') +backup=('etc/netdata/'{apps_groups,charts.d,health_alarm_notify,health_email_recipients,netdata,python.d}.conf + 'etc/netdata/health.d/'{apache,cpu,disks,entropy,memcached,mysql,named,net,nginx,qos,ram,redis,retroshare,squid,swap}.conf + 'etc/netdata/python.d/'{apache_cache,apache,cpufreq,dovecot,example,exim,hddtemp,ipfs,memcached,mysql,nginx,nginx_log,phpfpm,postfix,redis,retroshare,sensors,squid,tomcat}.conf) +install="${pkgname}.install" +source=("${url}/releases/download/v${pkgver}/${pkgname}-${pkgver}.tar.xz" + "${pkgname}.sysusers" + "${pkgname}.tmpfiles") +sha256sums=('c5f8cecf83a7ed8880003b66614c71f7b2bff5b594f412262ec85143ca44adae' + '35829f816093798e393123ba8c7a290a0188f37fb7fe3b725ca9d4b95b44e22f' + 'cca87c8de01675e658ff338a829d17e04f0fffd52efe81de8a18044dc5b5434d') + +prepare() { + cd "${pkgname}-${pkgver}" + autoreconf -fiv + + ./configure \ + --prefix="/usr" \ + --sbindir="/usr/bin" \ + --sysconfdir="/etc" \ + --libexecdir="/usr/lib" \ + --localstatedir="/var" \ + --with-zlib \ + --with-math \ + --with-user="${pkgname}" +} build() { - cd "$pkgname-$pkgver" - - ./autogen.sh - ./configure \ - --prefix="/usr" \ - --sbindir="/usr/bin" \ - --sysconfdir="/etc" \ - --libexecdir="/usr/lib" \ - --localstatedir="/var" \ - --with-zlib --with-math --with-user=netdata - make + cd "${pkgname}-${pkgver}" + make } package() { - cd "$pkgname-$pkgver" - - make DESTDIR="$pkgdir" install - - touch "$pkgdir/etc/netdata/netdata.conf" - - install -Dm0644 "system/netdata.service" "$pkgdir/usr/lib/systemd/system/netdata.service" + cd "${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -Dm0644 "system/${pkgname}.logrotate" "${pkgdir}/etc/logrotate.d/${pkgname}" + install -Dm0644 "system/${pkgname}.service" "${pkgdir}/usr/lib/systemd/system/netdata.service" + install -Dm0644 "${srcdir}/${pkgname}.tmpfiles" "${pkgdir}/usr/lib/tmpfiles.d/${pkgname}.conf" + install -Dm0644 "${srcdir}/${pkgname}.sysusers" "${pkgdir}/usr/lib/sysusers.d/${pkgname}.conf" + + # Remove /var/*, pacman create it via tmpfiles hook + rm -vrf "${pkgdir}/var" + chown -R 134:134 "${pkgdir}/usr/share/netdata" + touch "${pkgdir}/etc/${pkgname}/${pkgname}.conf" } -