diff options
| author | Lennart Weller <lhw@ring0.de> | 2016-04-27 14:58:57 +0000 |
|---|---|---|
| committer | Lennart Weller <lhw@ring0.de> | 2016-05-09 15:51:01 +0000 |
| commit | b5968a874ee8e42577a74d92e4825061dabb31d8 (patch) | |
| tree | a96a92ba391fb416fc1b68729fc57ad63fdf5156 /debian/rules | |
| parent | Update copyright syntax (diff) | |
| download | netdata-b5968a874ee8e42577a74d92e4825061dabb31d8.tar.xz netdata-b5968a874ee8e42577a74d92e4825061dabb31d8.zip | |
some bug fixes
Diffstat (limited to 'debian/rules')
| -rwxr-xr-x | debian/rules | 43 |
1 files changed, 15 insertions, 28 deletions
diff --git a/debian/rules b/debian/rules index dcc92dbbb..e853d24a8 100755 --- a/debian/rules +++ b/debian/rules @@ -23,7 +23,7 @@ export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed #dh $@ --with autoreconf override_dh_auto_configure: - dh_auto_configure -- --with-math --with-webdir=/var/lib/netdata/www + dh_auto_configure -- --with-math debian/%.postinst: debian/%.postinst.in sed 's/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/g' $< > $@ @@ -34,42 +34,29 @@ override_dh_install: debian/netdata.postinst # Remove unneeded .keep files # find "$(TOP)" -name .keep -exec rm '{}' ';' + rm -rf $(CURDIR)/debian/netdata-data/usr/share/netdata/web/old # Move files that local user shouldn't be editing to /usr/share/netdata # - mkdir -p "$(TOP)/usr/share/netdata" - for D in $$(find "$(TOP)/var/lib/netdata/www/" -maxdepth 1 -type d -printf '%f '); do \ - echo Relocating $$D; \ - mv "$(TOP)/var/lib/netdata/www/$$D" "$(TOP)/usr/share/netdata/$$D"; \ - ln -s "/usr/share/netdata/$$D" "$(TOP)/var/lib/netdata/www/$$D"; \ - done + #mkdir -p "$(TOP)/usr/share/netdata" + #for D in $$(find "$(TOP)/var/lib/netdata/www/" -maxdepth 1 -type d -printf '%f '); do \ + # echo Relocating $$D; \ + # mv "$(TOP)/var/lib/netdata/www/$$D" "$(TOP)/usr/share/netdata/$$D"; \ + # ln -s "/usr/share/netdata/$$D" "$(TOP)/var/lib/netdata/www/$$D"; \ + #done # Update postinst to set correct group for www files on installation. # Should probably be dpkg-statoverride really, but that gets *really* # messy. We also set all web files in /var as conffiles so an upgrade # doesn't splat them. # - for D in $$(find "$(TOP)/var/lib/netdata/www/" -maxdepth 1 -type f -printf '%f '); do \ - echo Updating postinst for $$D; \ - sed -i "s/^#PERMS#/chgrp netdata \/var\/lib\/netdata\/www\/$$D\n#PERMS#/g" \ - $(CURDIR)/debian/netdata.postinst; \ - echo "/var/lib/netdata/www/$$D" >> $(CURDIR)/debian/netdata.conffiles; \ - done - sed -i "/^#PERMS#/d" $(CURDIR)/debian/netdata.postinst - -override_dh_installdocs: - dh_installdocs - - # Docs should not be under /usr/lib - # - mv $(TOP)/usr/lib/$(DEB_HOST_MULTIARCH)/netdata/plugins.d/README.md \ - $(TOP)/usr/share/doc/netdata/README.plugins.md - mv $(TOP)/usr/lib/$(DEB_HOST_MULTIARCH)/netdata/charts.d/README.md \ - $(TOP)/usr/share/doc/netdata/README.charts.md - - # This doc is currently empty, so no point installing it. - # - rm $(TOP)/usr/lib/$(DEB_HOST_MULTIARCH)/netdata/node.d/README.md + #for D in $$(find "$(TOP)/var/lib/netdata/www/" -maxdepth 1 -type f -printf '%f '); do \ + # echo Updating postinst for $$D; \ + # sed -i "s/^#PERMS#/chgrp netdata \/var\/lib\/netdata\/www\/$$D\n#PERMS#/g" \ + # $(CURDIR)/debian/netdata.postinst; \ + # echo "/var/lib/netdata/www/$$D" >> $(CURDIR)/debian/netdata.conffiles; \ + #done + #sed -i "/^#PERMS#/d" $(CURDIR)/debian/netdata.postinst override_dh_fixperms: dh_fixperms |