Reorganize system directory to better reflect what files are actually used for. (#14544)

* Move systemd-specific system files to their own directory.

* Move non-systemd init scripts to individual subdirectories.

* Move cron files to their own directory.

* Move logrotate config to it’s own directory.

* Fix typos in Makefile.am.

* Fix Debian package builds.

* Fixed issues reported by @andrewm4894.

13 files changed, 84 insertions, 42 deletions

diff --git a/system/Makefile.am b/system/Makefile.am
index 1a1b41e26b..a8836b2b5f 100644
--- a/system/Makefile.am
+++ b/system/Makefile.am
@@ -3,16 +3,16 @@
 
 MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
 CLEANFILES = \
-    netdata-openrc \
-    netdata.logrotate \
-    netdata.service \
-    netdata.service.v235 \
-    netdata-init-d \
-    netdata-lsb \
-    netdata-freebsd \
-    netdata.plist \
-    netdata.crontab \
-    netdata-updater.service \
+    cron/netdata-updater-daily \
+    freebsd/rc.d/netdata \
+    initd/init.d/netdata \
+    launchd/netdata.plist \
+    logrotate/netdata \
+    lsb/init.d/netdata \
+    openrc/init.d/netdata \
+    systemd/netdata.service \
+    systemd/netdata.service.v235 \
+    systemd/netdata-updater.service \
     $(NULL)
 
 include $(top_srcdir)/build/subst.inc
@@ -26,44 +26,86 @@ dist_config_DATA = \
     .install-type \
     $(NULL)
 
+libsyscrondir=$(libsysdir)/cron
+libsysfreebsddir=$(libsysdir)/freebsd
+libsysfreebsdrcddir=$(libsysfreebsddir)/rc.d
+libsysinitddir=$(libsysdir)/initd
+libsysinitdinitddir=$(libsysinitddir)/init.d
+libsyslaunchddir=$(libsysdir)/launchd
+libsyslogrotatedir=$(libsysdir)/logrotate
+libsyslsbdir=$(libsysdir)/lsb
+libsyslsbinitddir=$(libsyslsbdir)/init.d
+libsysopenrcdir=$(libsysdir)/openrc
+libsysopenrcinitddir=$(libsysopenrcdir)/init.d
+libsyssystemddir=$(libsysdir)/systemd
+
 # Explicitly install directories to avoid permission issues due to umask
 install-exec-local:
 	$(INSTALL) -d $(DESTDIR)$(configdir)
 	$(INSTALL) -d $(DESTDIR)$(libsysdir)
+	$(INSTALL) -d $(DESTDIR)$(libsyscrondir)
+	$(INSTALL) -d $(DESTDIR)$(libsysfreebsdrcddir)
+	$(INSTALL) -d $(DESTDIR)$(libsysinitdinitddir)
+	$(INSTALL) -d $(DESTDIR)$(libsyslaunchddir)
+	$(INSTALL) -d $(DESTDIR)$(libsyslogrotatedir)
+	$(INSTALL) -d $(DESTDIR)$(libsyslsbinitddir)
+	$(INSTALL) -d $(DESTDIR)$(libsyssystemddir)
+	$(INSTALL) -d $(DESTDIR)$(libsysopenrcinitddir)
 
 libexecnetdatadir=$(libexecdir)/netdata
 nodist_libexecnetdata_SCRIPTS = \
     install-service.sh \
     $(NULL)
 
-nodist_libsys_DATA = \
-    netdata-openrc \
-    netdata.logrotate \
-    netdata.service \
-    netdata.service.v235 \
-    netdata-init-d \
-    netdata-lsb \
-    netdata-freebsd \
-    netdata.plist \
-    netdata.crontab \
-    netdata-updater.service \
+nodist_libsyscron_DATA = \
+    cron/netdata-updater-daily \
+    $(NULL)
+
+nodist_libsysfreebsdrcd_DATA = \
+    freebsd/rc.d/netdata \
+    $(NULL)
+
+nodist_libsysinitdinitd_DATA = \
+    initd/init.d/netdata \
+    $(NULL)
+
+nodist_libsyslaunchd_DATA = \
+    launchd/netdata.plist \
+    $(NULL)
+
+nodist_libsyslogrotate_DATA = \
+    logrotate/netdata \
+    $(NULL)
+
+nodist_libsyslsbinitd_DATA = \
+    lsb/init.d/netdata \
+    $(NULL)
+
+nodist_libsysopenrcinitd_DATA = \
+    openrc/init.d/netdata \
+    $(NULL)
+
+nodist_libsyssystemd_DATA = \
+    systemd/netdata.service \
+    systemd/netdata.service.v235 \
+    systemd/netdata-updater.service \
     $(NULL)
 
-dist_libsys_DATA = \
-    netdata-updater.timer \
+dist_libsyssystemd_DATA = \
+    systemd/netdata-updater.timer \
     $(NULL)
 
 dist_noinst_DATA = \
     install-service.sh.in \
-    netdata-openrc.in \
-    netdata.logrotate.in \
-    netdata.service.in \
-    netdata.service.v235.in \
-    netdata-init-d.in \
-    netdata-lsb.in \
-    netdata-freebsd.in \
-    netdata.plist.in \
     netdata.conf \
-    netdata.crontab.in \
-    netdata-updater.service.in \
+    cron/netdata-updater-daily.in \
+    freebsd/rc.d/netdata.in \
+    initd/init.d/netdata.in \
+    launchd/netdata.plist.in \
+    logrotate/netdata.in \
+    lsb/init.d/netdata.in \
+    openrc/init.d/netdata.in \
+    systemd/netdata.service.in \
+    systemd/netdata.service.v235.in \
+    systemd/netdata-updater.service.in \
     $(NULL)
diff --git a/system/netdata.crontab.in b/system/cron/netdata-updater-daily.in
index 8f0527e0e0..8f0527e0e0 100644
--- a/system/netdata.crontab.in
+++ b/system/cron/netdata-updater-daily.in
diff --git a/system/netdata-freebsd.in b/system/freebsd/rc.d/netdata.in
index fd544c86c5..fd544c86c5 100644
--- a/system/netdata-freebsd.in
+++ b/system/freebsd/rc.d/netdata.in
diff --git a/system/netdata-init-d.in b/system/initd/init.d/netdata.in
index c0257ffab5..c0257ffab5 100644
--- a/system/netdata-init-d.in
+++ b/system/initd/init.d/netdata.in
diff --git a/system/install-service.sh.in b/system/install-service.sh.in
index a014e3d08b..a85f15bd0f 100755
--- a/system/install-service.sh.in
+++ b/system/install-service.sh.in
@@ -102,7 +102,7 @@ valid_types() {
 }
 
 install_generic_service() {
-  svc_type="${1}"
+  svc_path="${1}"
   svc_type_name="${2}"
   svc_file="${3}"
   svc_enable_hook="${4}"
@@ -113,7 +113,7 @@ install_generic_service() {
     ENABLE="enable"
   fi
 
-  if ! install -p -m 0755 -o 0 -g 0 "${SVC_SOURCE}/netdata-${svc_type}" "${svc_file}"; then
+  if ! install -p -m 0755 -o 0 -g 0 "${SVC_SOURCE}/${svc_path}/netdata" "${svc_file}"; then
     error "Failed to install service file."
     exit 4
   fi
@@ -236,10 +236,10 @@ get_systemd_service_dir() {
 }
 
 install_systemd_service() {
-  SRCFILE="${SVC_SOURCE}/netdata.service"
+  SRCFILE="${SVC_SOURCE}/systemd/netdata.service"
 
   if [ "$(systemctl --version | head -n 1 | cut -f 2 -d ' ')" -le 235 ]; then
-    SRCFILE="${SVC_SOURCE}/netdata.service.v235"
+    SRCFILE="${SVC_SOURCE}/systemd/netdata.service.v235"
   fi
 
   if [ "${ENABLE}" = "auto" ]; then
@@ -341,7 +341,7 @@ disable_openrc() {
 }
 
 install_openrc_service() {
-  install_generic_service openrc OpenRC /etc/init.d/netdata enable_openrc disable_openrc
+  install_generic_service openrc/init.d OpenRC /etc/init.d/netdata enable_openrc disable_openrc
 }
 
 openrc_cmds() {
@@ -399,7 +399,7 @@ disable_lsb() {
 }
 
 install_lsb_service() {
-  install_generic_service lsb LSB /etc/init.d/netdata enable_lsb disable_lsb
+  install_generic_service lsb/init.d LSB /etc/init.d/netdata enable_lsb disable_lsb
 }
 
 lsb_cmds() {
@@ -454,7 +454,7 @@ disable_initd() {
 }
 
 install_initd_service() {
-  install_generic_service init-d init.d /etc/init.d/netdata enable_initd disable_initd
+  install_generic_service initd/init.d init.d /etc/init.d/netdata enable_initd disable_initd
 }
 
 initd_cmds() {
@@ -552,7 +552,7 @@ disable_freebsd() {
 }
 
 install_freebsd_service() {
-  install_generic_service freebsd "FreeBSD rc.d" /usr/local/etc/rc.d/netdata enable_freebsd disable_freebsd
+  install_generic_service freebsd/rc.d "FreeBSD rc.d" /usr/local/etc/rc.d/netdata enable_freebsd disable_freebsd
 }
 
 freebsd_cmds() {
@@ -566,7 +566,7 @@ freebsd_cmds() {
 
 install_darwin_service() {
   info "Installing macOS plist file for launchd."
-  if ! install -C -S -p -m 0644 -o 0 -g 0 system/netdata.plist /Library/LaunchDaemons/com.github.netdata.plist; then
+  if ! install -C -S -p -m 0644 -o 0 -g 0 system/launchd/netdata.plist /Library/LaunchDaemons/com.github.netdata.plist; then
     error "Failed to copy plist file."
     exit 4
   fi
diff --git a/system/netdata.plist.in b/system/launchd/netdata.plist.in
index a969b31775..a969b31775 100644
--- a/system/netdata.plist.in
+++ b/system/launchd/netdata.plist.in
diff --git a/system/netdata.logrotate.in b/system/logrotate/netdata.in
index 2c4949e5f6..2c4949e5f6 100644
--- a/system/netdata.logrotate.in
+++ b/system/logrotate/netdata.in
diff --git a/system/netdata-lsb.in b/system/lsb/init.d/netdata.in
index e429ad1c93..e429ad1c93 100644
--- a/system/netdata-lsb.in
+++ b/system/lsb/init.d/netdata.in
diff --git a/system/netdata-openrc.in b/system/openrc/init.d/netdata.in
index 1588789294..1588789294 100644
--- a/system/netdata-openrc.in
+++ b/system/openrc/init.d/netdata.in
diff --git a/system/netdata-updater.service.in b/system/systemd/netdata-updater.service.in
index d0bd4994c4..d0bd4994c4 100644
--- a/system/netdata-updater.service.in
+++ b/system/systemd/netdata-updater.service.in
diff --git a/system/netdata-updater.timer b/system/systemd/netdata-updater.timer
index 8b36e46ff4..8b36e46ff4 100644
--- a/system/netdata-updater.timer
+++ b/system/systemd/netdata-updater.timer
diff --git a/system/netdata.service.in b/system/systemd/netdata.service.in
index 25d95b2b81..25d95b2b81 100644
--- a/system/netdata.service.in
+++ b/system/systemd/netdata.service.in
diff --git a/system/netdata.service.v235.in b/system/systemd/netdata.service.v235.in
index e3232056fb..e3232056fb 100644
--- a/system/netdata.service.v235.in
+++ b/system/systemd/netdata.service.v235.in