use CHEF_USER/CHEF_GROUP instead to not clobber ENV, for CHEF-951

10 files changed, 20 insertions, 20 deletions

diff --git a/chef/distro/redhat/etc/init.d/chef-client b/chef/distro/redhat/etc/init.d/chef-client
index ff6edc26eb..3f53492935 100644
--- a/chef/distro/redhat/etc/init.d/chef-client
+++ b/chef/distro/redhat/etc/init.d/chef-client
@@ -17,8 +17,8 @@ prog="chef-client"
 pidfile=${PIDFILE-/var/run/chef/client.pid}
 lockfile=${LOCKFILE-/var/lock/subsys/$prog}
 config=${CONFIG-/etc/chef/client.rb}
-user=${USER-root}
-group=${GROUP-root}
+user=${CHEF_USER-root}
+group=${CHEF_GROUP-root}
 interval=${INTERVAL-1800}
 splay=${SPLAY-20}
 logfile=${LOGFILE-/var/log/chef/client.log}
diff --git a/chef/distro/redhat/etc/init.d/chef-server b/chef/distro/redhat/etc/init.d/chef-server
index 9729239e4b..a24dc3b0f8 100644
--- a/chef/distro/redhat/etc/init.d/chef-server
+++ b/chef/distro/redhat/etc/init.d/chef-server
@@ -18,8 +18,8 @@ childpidfiles=${CHILDPIDFILES-/var/run/chef/server.%s.pid}
 pidfile=${PIDFILE-/var/run/chef/server.main.pid}
 lockfile=${LOCKFILE-/var/lock/subsys/$prog}
 config=${CONFIG-/etc/chef/server.rb}
-user=${USER-chef}
-group=${GROUP-chef}
+user=${CHEF_USER-chef}
+group=${CHEF_GROUP-chef}
 cluster_nodes=${CLUSTER_NODES-1}
 logfile=${LOGFILE-/var/log/chef/merb.%s.log}
 options=${OPTIONS-}
diff --git a/chef/distro/redhat/etc/init.d/chef-server-webui b/chef/distro/redhat/etc/init.d/chef-server-webui
index 3b0b0d0ea6..44f595f419 100644
--- a/chef/distro/redhat/etc/init.d/chef-server-webui
+++ b/chef/distro/redhat/etc/init.d/chef-server-webui
@@ -18,8 +18,8 @@ childpidfiles=${CHILDPIDFILES-/var/run/chef/server-webui.%s.pid}
 pidfile=${PIDFILE-/var/run/chef/server-webui.main.pid}
 lockfile=${LOCKFILE-/var/lock/subsys/$prog}
 config=${CONFIG-/etc/chef/server.rb}
-user=${USER-chef}
-group=${GROUP-chef}
+user=${CHEF_USER-chef}
+group=${CHEF_GROUP-chef}
 cluster_nodes=${CLUSTER_NODES-1}
 logfile=${LOGFILE-/var/log/chef/merb-webui.%s.log}
 options=${OPTIONS-}
diff --git a/chef/distro/redhat/etc/init.d/chef-solr b/chef/distro/redhat/etc/init.d/chef-solr
index 6402ffb358..74f1d95303 100644
--- a/chef/distro/redhat/etc/init.d/chef-solr
+++ b/chef/distro/redhat/etc/init.d/chef-solr
@@ -17,8 +17,8 @@ prog="chef-solr"
 pidfile=${PIDFILE-/var/run/chef/solr.pid}
 lockfile=${LOCKFILE-/var/lock/subsys/$prog}
 config=${CONFIG-/etc/chef/server.rb}
-user=${USER-chef}
-group=${GROUP-chef}
+user=${CHEF_USER-chef}
+group=${CHEF_GROUP-chef}
 logfile=${LOGFILE-/var/log/chef/solr.log}
 options=${OPTIONS-}
 
diff --git a/chef/distro/redhat/etc/init.d/chef-solr-indexer b/chef/distro/redhat/etc/init.d/chef-solr-indexer
index 612c126950..55c63810e6 100644
--- a/chef/distro/redhat/etc/init.d/chef-solr-indexer
+++ b/chef/distro/redhat/etc/init.d/chef-solr-indexer
@@ -17,8 +17,8 @@ prog="chef-solr-indexer"
 pidfile=${PIDFILE-/var/run/chef/solr-indexer.pid}
 lockfile=${LOCKFILE-/var/lock/subsys/$prog}
 config=${CONFIG-/etc/chef/server.rb}
-user=${USER-chef}
-group=${GROUP-chef}
+user=${CHEF_USER-chef}
+group=${CHEF_GROUP-chef}
 logfile=${LOGFILE-/var/log/chef/solr-indexer.log}
 
 start() {
diff --git a/chef/distro/redhat/etc/sysconfig/chef-client b/chef/distro/redhat/etc/sysconfig/chef-client
index 40278e33d8..5bebb85608 100644
--- a/chef/distro/redhat/etc/sysconfig/chef-client
+++ b/chef/distro/redhat/etc/sysconfig/chef-client
@@ -2,8 +2,8 @@
 
 #PIDFILE=/var/run/chef/client.pid
 #CONFIG=/etc/chef/client.rb
-#USER=root
-#GROUP=root
+#CHEF_USER=root
+#CHEF_GROUP=root
 #INTERVAL=1800
 #SPLAY=20
 #LOGFILE=/var/log/chef/client.log
diff --git a/chef/distro/redhat/etc/sysconfig/chef-server b/chef/distro/redhat/etc/sysconfig/chef-server
index 83c39849fa..b0a1cb5113 100644
--- a/chef/distro/redhat/etc/sysconfig/chef-server
+++ b/chef/distro/redhat/etc/sysconfig/chef-server
@@ -3,8 +3,8 @@
 #CHILDPIDFILES=/var/run/chef/server.%s.pid
 #PIDFILE=/var/run/chef/server.pid
 #CONFIG=/etc/chef/server.rb
-#USER=chef
-#GROUP=chef
+#CHEF_USER=chef
+#CHEF_GROUP=chef
 #CLUSTER_NODES=1
 #LOGFILE=/var/log/chef/merb.%s.log
 #OPTIONS=
diff --git a/chef/distro/redhat/etc/sysconfig/chef-server-webui b/chef/distro/redhat/etc/sysconfig/chef-server-webui
index 29941c3e42..0dd8f2977b 100644
--- a/chef/distro/redhat/etc/sysconfig/chef-server-webui
+++ b/chef/distro/redhat/etc/sysconfig/chef-server-webui
@@ -3,8 +3,8 @@
 #CHILDPIDFILES=/var/run/chef/server-webui.%s.pid
 #PIDFILE=/var/run/chef/server-webui.pid
 #CONFIG=/etc/chef/server.rb
-#USER=chef
-#GROUP=chef
+#CHEF_USER=chef
+#CHEF_GROUP=chef
 #CLUSTER_NODES=1
 #LOGFILE=/var/log/chef/merb-webui.%s.log
 #OPTIONS=
diff --git a/chef/distro/redhat/etc/sysconfig/chef-solr b/chef/distro/redhat/etc/sysconfig/chef-solr
index dde3895316..a7db2220fc 100644
--- a/chef/distro/redhat/etc/sysconfig/chef-solr
+++ b/chef/distro/redhat/etc/sysconfig/chef-solr
@@ -2,8 +2,8 @@
 
 #PIDFILE=/var/run/chef/solr.pid
 #CONFIG=/etc/chef/server.rb
-#USER=chef
-#GROUP=chef
+#CHEF_USER=chef
+#CHEF_GROUP=chef
 #LOGFILE=/var/log/chef/solr.log
 # options for Java.
 #OPTIONS=
diff --git a/chef/distro/redhat/etc/sysconfig/chef-solr-indexer b/chef/distro/redhat/etc/sysconfig/chef-solr-indexer
index 9c794d523a..bf801ac334 100644
--- a/chef/distro/redhat/etc/sysconfig/chef-solr-indexer
+++ b/chef/distro/redhat/etc/sysconfig/chef-solr-indexer
@@ -2,6 +2,6 @@
 
 #PIDFILE=/var/run/chef/solr-indexer.pid
 #CONFIG=/etc/chef/server.rb
-#USER=chef
-#GROUP=chef
+#CHEF_USER=chef
+#CHEF_GROUP=chef
 #LOGFILE=/var/log/chef/solr-indexer.log