From d59faafd895dfa71f7729530fe4e38a9d84e7c27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20H=C3=B8ydahl?= <janhoy@apache.org>
Date: Tue, 9 May 2017 13:03:18 +0200
Subject: [PATCH] SOLR-10644: solr.in.sh installed by install script should be
 writable by solr user

---
 solr/CHANGES.txt                 | 2 ++
 solr/bin/install_solr_service.sh | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 41586ed5f8f..d2ce667d7b0 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -398,6 +398,8 @@ Other Changes
   was an improvement for the json "arrntv" format, it caused problems for the default json format.
   (James Dyer, reported by Nikita Pchelintsev)
 
+* SOLR-10644: solr.in.sh installed by install script should be writable by solr user (janhoy)
+
 ==================  6.5.1 ==================
 
 Bug Fixes
diff --git a/solr/bin/install_solr_service.sh b/solr/bin/install_solr_service.sh
index f42dd5aab7a..54b62e58746 100755
--- a/solr/bin/install_solr_service.sh
+++ b/solr/bin/install_solr_service.sh
@@ -331,8 +331,8 @@ SOLR_LOGS_DIR=\"$SOLR_VAR_DIR/logs\"
 SOLR_PORT=\"$SOLR_PORT\"
 " >> "/etc/default/$SOLR_SERVICE.in.sh"
 fi
-chown root: "/etc/default/$SOLR_SERVICE.in.sh"
-chmod 0644 "/etc/default/$SOLR_SERVICE.in.sh"
+chown ${SOLR_USER}: "/etc/default/$SOLR_SERVICE.in.sh"
+chmod 0660 "/etc/default/$SOLR_SERVICE.in.sh"
 
 # install data directories and files
 mkdir -p "$SOLR_VAR_DIR/data"