From: Costa Tsaousis <costa@tsaousis.gr>
Date: Fri, 15 Apr 2016 08:34:29 +0000 (+0300)
Subject: Merge pull request #228 from fgtham/master
X-Git-Tag: v1.1.0~20
X-Git-Url: https://arthur.barton.de/gitweb/?a=commitdiff_plain;h=48a6947689d8b6b1ee8efc48baf561dc32b221d7;hp=c223fcd68662d667441cf6817d25dcafb2058582;p=netdata.git

Merge pull request #228 from fgtham/master

gentoo ebuild: fix permissions
---

diff --git a/system/netdata.service.in b/system/netdata.service.in
index e26068d2..bc26cc9d 100644
--- a/system/netdata.service.in
+++ b/system/netdata.service.in
@@ -1,5 +1,5 @@
 [Unit]
-Description=netdata
+Description=Linux real time system monitoring, over the web
 After=network.target httpd.service squid.service nfs-server.service mysqld.service named.service postfix.service
 
 [Service]
diff --git a/web/Makefile.am b/web/Makefile.am
index b162ae1b..14b28b61 100644
--- a/web/Makefile.am
+++ b/web/Makefile.am
@@ -4,75 +4,75 @@
 MAINTAINERCLEANFILES= $(srcdir)/Makefile.in
 
 dist_web_DATA = \
-        robots.txt \
-        index.html \
+	robots.txt \
+	index.html \
 	demo.html \
 	demo2.html \
 	tv.html \
-        dashboard.html \
-        dashboard.js \
-        dashboard.css \
-        dashboard.slate.css \
+	dashboard.html \
+	dashboard.js \
+	dashboard.css \
+	dashboard.slate.css \
 	favicon.ico \
 	netdata-swagger.yaml \
 	netdata-swagger.json \
-        version.txt \
-        $(NULL)
+	version.txt \
+	$(NULL)
 
 webolddir=$(webdir)/old
 dist_webold_DATA = \
-        old/datasource.html \
-        old/index.html \
-        old/index.js \
-        old/netdata.js \
-        old/theme.css \
-        $(NULL)
+	old/datasource.html \
+	old/index.html \
+	old/index.js \
+	old/netdata.js \
+	old/theme.css \
+	$(NULL)
 
 weblibdir=$(webdir)/lib
 dist_weblib_DATA = \
-        lib/dygraph-combined.js \
-        lib/dygraph-smooth-plotter.js \
-        lib/jquery-1.12.0.min.js \
-        lib/jquery.peity.min.js \
-        lib/jquery.sparkline.min.js \
-        lib/morris.min.js \
-        lib/raphael-min.js \
+	lib/dygraph-combined.js \
+	lib/dygraph-smooth-plotter.js \
+	lib/jquery-1.12.0.min.js \
+	lib/jquery.peity.min.js \
+	lib/jquery.sparkline.min.js \
+	lib/morris.min.js \
+	lib/raphael-min.js \
 	lib/jquery.easypiechart.min.js \
 	lib/jquery.nanoscroller.min.js \
-        lib/bootstrap.min.js \
+	lib/bootstrap.min.js \
 	lib/ElementQueries.js \
 	lib/ResizeSensor.js \
-        lib/bootstrap-toggle.min.js \
-        lib/c3.min.js \
-        lib/d3.min.js \
-        lib/gauge.min.js \
-        $(NULL)
+	lib/bootstrap-toggle.min.js \
+	lib/c3.min.js \
+	lib/d3.min.js \
+	lib/gauge.min.js \
+	$(NULL)
 
 webcssdir=$(webdir)/css
 dist_webcss_DATA = \
-        css/morris.css \
-        css/bootstrap.min.css \
-        css/bootstrap-theme.min.css \
-        css/bootstrap.slate.min.css \
+	css/morris.css \
+	css/bootstrap.min.css \
+	css/bootstrap-theme.min.css \
+	css/bootstrap.slate.min.css \
 	css/font-awesome.min.css \
-        css/bootstrap-toggle.min.css \
-        css/c3.min.css \
-        $(NULL)
+	css/bootstrap-toggle.min.css \
+	css/c3.min.css \
+	$(NULL)
 
 webfontsdir=$(webdir)/fonts
 dist_webfonts_DATA = \
-        fonts/glyphicons-halflings-regular.eot \
-        fonts/glyphicons-halflings-regular.svg \
-        fonts/glyphicons-halflings-regular.ttf \
-        fonts/glyphicons-halflings-regular.woff \
-        fonts/glyphicons-halflings-regular.woff2 \
+	fonts/glyphicons-halflings-regular.eot \
+	fonts/glyphicons-halflings-regular.svg \
+	fonts/glyphicons-halflings-regular.ttf \
+	fonts/glyphicons-halflings-regular.woff \
+	fonts/glyphicons-halflings-regular.woff2 \
 	fonts/FontAwesome.otf \
 	fonts/fontawesome-webfont.eot \
 	fonts/fontawesome-webfont.svg \
 	fonts/fontawesome-webfont.ttf \
 	fonts/fontawesome-webfont.woff \
 	fonts/fontawesome-webfont.woff2 \
-        $(NULL)
+	$(NULL)
 
 webimagesdir=$(webdir)/images
 dist_webimages_DATA = \
@@ -88,12 +88,12 @@ dist_webimages_DATA = \
 	images/seo-performance-512.png \
 	images/seo-performance-multi-size.ico \
 	images/seo-performance-multi-size.icns \
-        $(NULL)
+	$(NULL)
 
 version.txt:
 	if test -d "$(top_srcdir)/.git"; then \
 		if git --git-dir="$(top_srcdir)/.git" log -n 1 > v.tmp; then \
-			grep ^commit\  v.tmp | cut -d" " -f2 > version.txt; \
+			grep ^commit\ v.tmp | cut -d" " -f2 > version.txt; \
 			rm -f v.tmp; \
 		else \
 			rm -f v.tmp; \