lucene-solr:branch_6x: SOLR-10644: solr.in.sh installed by install script should be writable by solr user

[ja...@apache.org]

Repository: lucene-solr
Updated Branches:
  refs/heads/branch_6x 4dbc3fcb9 -> efed0277d


SOLR-10644: solr.in.sh installed by install script should be writable by solr user

(cherry picked from commit d59faaf)


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/efed0277
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/efed0277
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/efed0277

Branch: refs/heads/branch_6x
Commit: efed0277dd3fe9b7e81f260f4f2d4fc023eea50d
Parents: 4dbc3fc
Author: Jan Høydahl <ja...@apache.org>
Authored: Tue May 9 13:03:18 2017 +0200
Committer: Jan Høydahl <ja...@apache.org>
Committed: Tue May 9 13:10:30 2017 +0200

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


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/efed0277/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index e93a28d..581d777 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -303,6 +303,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

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/efed0277/solr/bin/install_solr_service.sh
----------------------------------------------------------------------
diff --git a/solr/bin/install_solr_service.sh b/solr/bin/install_solr_service.sh
index f42dd5a..54b62e5 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"