From e8355087ead4bded8f31ee8746f36dc097d5f7a1 Mon Sep 17 00:00:00 2001
From: Takuya ASADA <syuu@scylladb.com>
Date: Wed, 4 Sep 2019 08:54:01 +0900
Subject: [PATCH] dist/common/systemd: untemplataize *.service, use drop-in
 units instead

Since systemd unit can override parameters using drop-in unit, we don't need
mustache template for them.

Also, drop --disttype option on install.sh since it does not required anymore,
introduce --sysconfdir instead for non-redhat distributions.
---
 ...mx.service.mustache => scylla-jmx.service} |  5 ---
 dist/debian/rules.mustache                    |  2 +-
 dist/redhat/scylla-jmx.spec.mustache          |  2 +-
 install.sh                                    | 36 +++++++++----------
 4 files changed, 18 insertions(+), 27 deletions(-)
 rename dist/common/systemd/{scylla-jmx.service.mustache => scylla-jmx.service} (83%)

diff --git a/dist/common/systemd/scylla-jmx.service.mustache b/dist/common/systemd/scylla-jmx.service
similarity index 83%
rename from dist/common/systemd/scylla-jmx.service.mustache
rename to dist/common/systemd/scylla-jmx.service
index 4e1dd6e..e30dc3b 100644
--- a/dist/common/systemd/scylla-jmx.service.mustache
+++ b/dist/common/systemd/scylla-jmx.service
@@ -5,12 +5,7 @@ After=scylla-server.service
 
 [Service]
 Type=simple
-{{#debian}}
-EnvironmentFile=/etc/default/scylla-jmx
-{{/debian}}
-{{#redhat}}
 EnvironmentFile=/etc/sysconfig/scylla-jmx
-{{/redhat}}
 User=scylla
 Group=scylla
 ExecStart=/opt/scylladb/jmx/scylla-jmx $SCYLLA_JMX_PORT $SCYLLA_API_PORT $SCYLLA_API_ADDR $SCYLLA_JMX_ADDR $SCYLLA_JMX_FILE $SCYLLA_JMX_LOCAL $SCYLLA_JMX_REMOTE $SCYLLA_JMX_DEBUG
diff --git a/dist/debian/rules.mustache b/dist/debian/rules.mustache
index a989d99..a6030f6 100755
--- a/dist/debian/rules.mustache
+++ b/dist/debian/rules.mustache
@@ -6,7 +6,7 @@ override_dh_auto_clean:
 
 override_dh_auto_install:
 	dh_auto_install
-	./install.sh --root "$(CURDIR)/debian/{{product}}-jmx" --disttype debian
+	./install.sh --root "$(CURDIR)/debian/{{product}}-jmx" --sysconfdir /etc/default
 
 override_dh_installinit:
 {{#scylla}}
diff --git a/dist/redhat/scylla-jmx.spec.mustache b/dist/redhat/scylla-jmx.spec.mustache
index cf0270b..714ea6b 100644
--- a/dist/redhat/scylla-jmx.spec.mustache
+++ b/dist/redhat/scylla-jmx.spec.mustache
@@ -24,7 +24,7 @@ Requires:       {{product}}-server java-1.8.0-openjdk-headless
 %build
 
 %install
-./install.sh --root "$RPM_BUILD_ROOT" --disttype "redhat"
+./install.sh --root "$RPM_BUILD_ROOT"
 
 %pre
 /usr/sbin/groupadd scylla 2> /dev/null || :
diff --git a/install.sh b/install.sh
index 0747db0..80201d7 100755
--- a/install.sh
+++ b/install.sh
@@ -29,7 +29,7 @@ Usage: install.sh [options]
 Options:
   --root /path/to/root     alternative install root (default /)
   --prefix /prefix         directory prefix (default /usr)
-  --disttype [redhat|debian] specify type of distribution (redhat/debian)
+  --sysconfdir /etc/sysconfig   specify sysconfig directory name
   --help                   this helpful message
 EOF
     exit 1
@@ -37,6 +37,7 @@ EOF
 
 root=/
 prefix=/opt/scylladb
+sysconfdir=/etc/sysconfig
 
 while [ $# -gt 0 ]; do
     case "$1" in
@@ -48,8 +49,8 @@ while [ $# -gt 0 ]; do
             prefix="$2"
             shift 2
             ;;
-        "--disttype")
-            disttype="$2"
+        "--sysconfdir")
+            sysconfdir="$2"
             shift 2
             ;;
         "--help")
@@ -65,27 +66,22 @@ done
 rprefix="$root/$prefix"
 retc="$root/etc"
 rusr="$root/usr"
+rsysconfdir="$root/$sysconfdir"
 
-if [ "$disttype" = "redhat" ]; then
-    MUSTACHE_DIST="\"redhat\": true"
-    sysconfdir=sysconfig
-elif [ "$disttype" = "debian" ]; then
-    MUSTACHE_DIST="\"debian\": true"
-    sysconfdir=default
-else
-    print_usage
-    exit 1
-fi
-
-mkdir -p build
-pystache dist/common/systemd/scylla-jmx.service.mustache "{ $MUSTACHE_DIST }" > build/scylla-jmx.service
-
-install -d -m755 "$retc"/"$sysconfdir"
+install -d -m755 "$rsysconfdir"
 install -d -m755 "$rusr"/lib/systemd/system
 install -d -m755 "$rprefix/scripts" "$rprefix/jmx" "$rprefix/jmx/symlinks"
 
-install -m644 dist/common/sysconfig/scylla-jmx -Dt "$retc"/"$sysconfdir"
-install -m644 build/scylla-jmx.service  -Dt "$rusr"/lib/systemd/system
+install -m644 dist/common/sysconfig/scylla-jmx -Dt "$rsysconfdir"
+install -m644 dist/common/systemd/scylla-jmx.service  -Dt "$rusr"/lib/systemd/system
+if [ "$sysconfdir" != "/etc/sysconfig" ]; then
+    install -d -m755 "$retc"/systemd/system/scylla-jmx.service.d
+    cat << EOS > "$retc"/systemd/system/scylla-jmx.service.d/sysconfdir.conf
+[Service]
+EnvironmentFile=
+EnvironmentFile=$sysconfdir/scylla-jmx
+EOS
+fi
 
 install -m644 scylla-jmx-1.0.jar "$rprefix/jmx"
 install -m755 scylla-jmx "$rprefix/jmx"