SERVER-13016 Change rpm username from mongodb to mongod

5 files changed, 44 insertions, 42 deletions

diff --git a/rpm/init.d-mongod b/rpm/init.d-mongod
index f0a6ba2f065..0d7aaa555fc 100644
--- a/rpm/init.d-mongod
+++ b/rpm/init.d-mongod
@@ -26,8 +26,8 @@ DBPATH=`awk -F= '/^dbpath[[:blank:]]*=[[:blank:]]*/{print $2}' "$CONFIGFILE"`
 PIDFILE=`awk -F= '/^pidfilepath[[:blank:]]*=[[:blank:]]*/{print $2}' "$CONFIGFILE"`
 mongod=${MONGOD-/usr/bin/mongod}
 
-MONGO_USER=mongodb
-MONGO_GROUP=mongodb
+MONGO_USER=mongod
+MONGO_GROUP=mongod
 
 if [ -f "$SYSCONFIG" ]; then
     . "$SYSCONFIG"
diff --git a/rpm/mongodb-enterprise-unstable.spec b/rpm/mongodb-enterprise-unstable.spec
index a1d14452580..198eb57f7a6 100644
--- a/rpm/mongodb-enterprise-unstable.spec
+++ b/rpm/mongodb-enterprise-unstable.spec
@@ -102,11 +102,11 @@ touch $RPM_BUILD_ROOT/var/log/mongodb/mongod.log
 rm -rf $RPM_BUILD_ROOT
 
 %pre server
-if ! /usr/bin/id -g mongodb &>/dev/null; then
-    /usr/sbin/groupadd -r mongodb
+if ! /usr/bin/id -g mongod &>/dev/null; then
+    /usr/sbin/groupadd -r mongod
 fi
-if ! /usr/bin/id mongodb &>/dev/null; then
-    /usr/sbin/useradd -M -r -g mongodb -d /var/lib/mongodb -s /bin/false 	-c mongodb mongodb > /dev/null 2>&1
+if ! /usr/bin/id mongod &>/dev/null; then
+    /usr/sbin/useradd -M -r -g mongod -d /var/lib/mongodb -s /bin/false 	-c mongod mongod > /dev/null 2>&1
 fi
 
 %post server
@@ -136,10 +136,10 @@ fi
 %{_mandir}/man1/mongod.1*
 /etc/rc.d/init.d/mongod
 /etc/sysconfig/mongod
-%attr(0755,mongodb,mongodb) %dir /var/lib/mongodb
-%attr(0755,mongodb,mongodb) %dir /var/log/mongodb
-%attr(0755,mongodb,mongodb) %dir /var/run/mongodb
-%attr(0640,mongodb,mongodb) %config(noreplace) %verify(not md5 size mtime) /var/log/mongodb/mongod.log
+%attr(0755,mongod,mongod) %dir /var/lib/mongodb
+%attr(0755,mongod,mongod) %dir /var/log/mongodb
+%attr(0755,mongod,mongod) %dir /var/run/mongodb
+%attr(0640,mongod,mongod) %config(noreplace) %verify(not md5 size mtime) /var/log/mongodb/mongod.log
 %doc snmp/MONGOD-MIB.txt
 %doc snmp/MONGODBINC-MIB.txt
 %doc snmp/mongod.conf.master
diff --git a/rpm/mongodb-enterprise.spec b/rpm/mongodb-enterprise.spec
index 39e1cbc8870..4a61d1d4cf1 100644
--- a/rpm/mongodb-enterprise.spec
+++ b/rpm/mongodb-enterprise.spec
@@ -93,24 +93,16 @@ mkdir -p $RPM_BUILD_ROOT/var/lib/mongodb
 mkdir -p $RPM_BUILD_ROOT/var/log/mongodb
 mkdir -p $RPM_BUILD_ROOT/var/run/mongodb
 touch $RPM_BUILD_ROOT/var/log/mongodb/mongod.log
-%doc snmp/MONGOD-MIB.txt
-%doc snmp/MONGODBINC-MIB.txt
-%doc snmp/mongod.conf.master
-%doc snmp/mongod.conf.subagent
-%doc snmp/README-snmp.txt
-%doc LICENSE.txt
-%doc README
-%doc THIRD-PARTY-NOTICES
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %pre server
-if ! /usr/bin/id -g mongodb &>/dev/null; then
-    /usr/sbin/groupadd -r mongodb
+if ! /usr/bin/id -g mongod &>/dev/null; then
+    /usr/sbin/groupadd -r mongod
 fi
-if ! /usr/bin/id mongodb &>/dev/null; then
-    /usr/sbin/useradd -M -r -g mongodb -d /var/lib/mongodb -s /bin/false 	-c mongodb mongodb > /dev/null 2>&1
+if ! /usr/bin/id mongod &>/dev/null; then
+    /usr/sbin/useradd -M -r -g mongod -d /var/lib/mongodb -s /bin/false 	-c mongod mongod > /dev/null 2>&1
 fi
 
 %post server
@@ -140,10 +132,20 @@ fi
 %{_mandir}/man1/mongod.1*
 /etc/rc.d/init.d/mongod
 /etc/sysconfig/mongod
-%attr(0755,mongodb,mongodb) %dir /var/lib/mongodb
-%attr(0755,mongodb,mongodb) %dir /var/log/mongodb
-%attr(0755,mongodb,mongodb) %dir /var/run/mongodb
-%attr(0640,mongodb,mongodb) %config(noreplace) %verify(not md5 size mtime) /var/log/mongodb/mongod.log
+%attr(0755,mongod,mongod) %dir /var/lib/mongodb
+%attr(0755,mongod,mongod) %dir /var/log/mongodb
+%attr(0755,mongod,mongod) %dir /var/run/mongodb
+%attr(0640,mongod,mongod) %config(noreplace) %verify(not md5 size mtime) /var/log/mongodb/mongod.log
+%doc snmp/MONGOD-MIB.txt
+%doc snmp/MONGODBINC-MIB.txt
+%doc snmp/mongod.conf.master
+%doc snmp/mongod.conf.subagent
+%doc snmp/README-snmp.txt
+%doc LICENSE.txt
+%doc README
+%doc THIRD-PARTY-NOTICES
+
+
 
 %files shell
 %defattr(-,root,root,-)
diff --git a/rpm/mongodb-org-unstable.spec b/rpm/mongodb-org-unstable.spec
index 07e131d7b00..00ced8b02b6 100644
--- a/rpm/mongodb-org-unstable.spec
+++ b/rpm/mongodb-org-unstable.spec
@@ -96,11 +96,11 @@ touch $RPM_BUILD_ROOT/var/log/mongodb/mongod.log
 rm -rf $RPM_BUILD_ROOT
 
 %pre server
-if ! /usr/bin/id -g mongodb &>/dev/null; then
-    /usr/sbin/groupadd -r mongodb
+if ! /usr/bin/id -g mongod &>/dev/null; then
+    /usr/sbin/groupadd -r mongod
 fi
-if ! /usr/bin/id mongodb &>/dev/null; then
-    /usr/sbin/useradd -M -r -g mongodb -d /var/lib/mongodb -s /bin/false 	-c mongodb mongodb > /dev/null 2>&1
+if ! /usr/bin/id mongod &>/dev/null; then
+    /usr/sbin/useradd -M -r -g mongod -d /var/lib/mongodb -s /bin/false 	-c mongod mongod > /dev/null 2>&1
 fi
 
 %post server
@@ -130,10 +130,10 @@ fi
 %{_mandir}/man1/mongod.1*
 /etc/rc.d/init.d/mongod
 /etc/sysconfig/mongod
-%attr(0755,mongodb,mongodb) %dir /var/lib/mongodb
-%attr(0755,mongodb,mongodb) %dir /var/log/mongodb
-%attr(0755,mongodb,mongodb) %dir /var/run/mongodb
-%attr(0640,mongodb,mongodb) %config(noreplace) %verify(not md5 size mtime) /var/log/mongodb/mongod.log
+%attr(0755,mongod,mongod) %dir /var/lib/mongodb
+%attr(0755,mongod,mongod) %dir /var/log/mongodb
+%attr(0755,mongod,mongod) %dir /var/run/mongodb
+%attr(0640,mongod,mongod) %config(noreplace) %verify(not md5 size mtime) /var/log/mongodb/mongod.log
 
 %files shell
 %defattr(-,root,root,-)
diff --git a/rpm/mongodb-org.spec b/rpm/mongodb-org.spec
index f26c3dea211..dc976cadf54 100644
--- a/rpm/mongodb-org.spec
+++ b/rpm/mongodb-org.spec
@@ -96,11 +96,11 @@ touch $RPM_BUILD_ROOT/var/log/mongodb/mongod.log
 rm -rf $RPM_BUILD_ROOT
 
 %pre server
-if ! /usr/bin/id -g mongodb &>/dev/null; then
-    /usr/sbin/groupadd -r mongodb
+if ! /usr/bin/id -g mongod &>/dev/null; then
+    /usr/sbin/groupadd -r mongod
 fi
-if ! /usr/bin/id mongodb &>/dev/null; then
-    /usr/sbin/useradd -M -r -g mongodb -d /var/lib/mongodb -s /bin/false 	-c mongodb mongodb > /dev/null 2>&1
+if ! /usr/bin/id mongod &>/dev/null; then
+    /usr/sbin/useradd -M -r -g mongod -d /var/lib/mongodb -s /bin/false 	-c mongod mongod > /dev/null 2>&1
 fi
 
 %post server
@@ -130,10 +130,10 @@ fi
 %{_mandir}/man1/mongod.1*
 /etc/rc.d/init.d/mongod
 /etc/sysconfig/mongod
-%attr(0755,mongodb,mongodb) %dir /var/lib/mongodb
-%attr(0755,mongodb,mongodb) %dir /var/log/mongodb
-%attr(0755,mongodb,mongodb) %dir /var/run/mongodb
-%attr(0640,mongodb,mongodb) %config(noreplace) %verify(not md5 size mtime) /var/log/mongodb/mongod.log
+%attr(0755,mongod,mongod) %dir /var/lib/mongodb
+%attr(0755,mongod,mongod) %dir /var/log/mongodb
+%attr(0755,mongod,mongod) %dir /var/run/mongodb
+%attr(0640,mongod,mongod) %config(noreplace) %verify(not md5 size mtime) /var/log/mongodb/mongod.log
 
 %files shell
 %defattr(-,root,root,-)