[mongodb] Changed names of configuration and log files
Marek Skalický
mskalick at fedoraproject.org
Thu Feb 5 13:38:52 UTC 2015
commit 9a1cc52f0d0cd6c1486370f28b7509f839dfdbf6
Author: Marek Skalický <mskalick at redhat.com>
Date: Wed Feb 4 13:09:22 2015 +0100
Changed names of configuration and log files
mongodb.conf => mongod.conf | 2 +-
mongod.init | 2 +-
mongod.sysconf | 2 +-
mongodb-2.4.5-gcc48.patch | 62 -------------------------------------
mongodb.spec | 33 ++++++++++++--------
mongodb-shard.conf => mongos.conf | 2 +-
mongos.init | 2 +-
mongos.sysconf | 2 +-
8 files changed, 26 insertions(+), 81 deletions(-)
---
diff --git a/mongodb.conf b/mongod.conf
similarity index 99%
rename from mongodb.conf
rename to mongod.conf
index b9c5174..10573c5 100644
--- a/mongodb.conf
+++ b/mongod.conf
@@ -15,7 +15,7 @@ fork = true
pidfilepath = /var/run/mongodb/mongod.pid
# Log file to send write to instead of stdout - has to be a file, not directory
-logpath = /var/log/mongodb/mongodb.log
+logpath = /var/log/mongodb/mongod.log
# Alternative directory for UNIX domain sockets (defaults to /tmp)
unixSocketPrefix = /var/run/mongodb
diff --git a/mongod.init b/mongod.init
index 42be467..fedbe6a 100644
--- a/mongod.init
+++ b/mongod.init
@@ -11,7 +11,7 @@
exec="/usr/bin/mongod"
prog="mongod"
-logfile="/var/log/mongodb/mongodb.log"
+logfile="/var/log/mongodb/mongod.log"
[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
diff --git a/mongod.sysconf b/mongod.sysconf
index 7614052..d4d5adf 100644
--- a/mongod.sysconf
+++ b/mongod.sysconf
@@ -1 +1 @@
-OPTIONS="--quiet -f /etc/mongodb.conf"
+OPTIONS="--quiet -f /etc/mongod.conf"
diff --git a/mongodb.spec b/mongodb.spec
index 75256e9..381008e 100644
--- a/mongodb.spec
+++ b/mongodb.spec
@@ -8,7 +8,7 @@
Name: mongodb
Version: 2.6.7
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: High-performance, schema-free document-oriented database
Group: Applications/Databases
License: AGPLv3 and zlib and ASL 2.0
@@ -20,11 +20,11 @@ URL: http://www.mongodb.org
Source0: http://fastdl.mongodb.org/src/%{pkg_name}-src-r%{version}.tar.gz
Source1: %{pkg_name}-tmpfile
Source2: %{pkg_name}.logrotate
-Source3: %{pkg_name}.conf
+Source3: %{daemon}.conf
Source4: %{daemon}.init
Source5: %{daemon}.service
Source6: %{daemon}.sysconf
-Source7: %{pkg_name}-shard.conf
+Source7: %{daemonshard}.conf
Source8: %{daemonshard}.init
Source9: %{daemonshard}.service
Source10: %{daemonshard}.sysconf
@@ -39,10 +39,14 @@ Source11: README
# -> upstream solved it, by default -Wno-unused-local-typedefs is used
#Patch8: mongodb-2.4.5-gcc48.patch
+# compile with boost 1.57.0
+# -> fixed by upstream in r2.7.6
Patch9: mongodb-2.6.7-swap.patch
Requires: v8 >= 3.14.5.10
+%ifarch %{arm}
BuildRequires: gcc >= 4.7
+%endif
BuildRequires: pcre-devel
BuildRequires: boost-devel >= 1.44
# Provides tcmalloc
@@ -187,8 +191,8 @@ install -p -D -m 755 "%{SOURCE4}" %{buildroot}%{_root_initddir}/%{daemon}
install -p -D -m 755 "%{SOURCE8}" %{buildroot}%{_root_initddir}/%{daemonshard}
%endif
install -p -D -m 644 "%{SOURCE2}" %{buildroot}%{_sysconfdir}/logrotate.d/%{pkg_name}
-install -p -D -m 644 "%{SOURCE3}" %{buildroot}%{_sysconfdir}/%{pkg_name}.conf
-install -p -D -m 644 "%{SOURCE7}" %{buildroot}%{_sysconfdir}/%{pkg_name}-shard.conf
+install -p -D -m 644 "%{SOURCE3}" %{buildroot}%{_sysconfdir}/%{daemon}.conf
+install -p -D -m 644 "%{SOURCE7}" %{buildroot}%{_sysconfdir}/%{daemonshard}.conf
install -p -D -m 644 "%{SOURCE6}" %{buildroot}%{_sysconfdir}/sysconfig/%{daemon}
install -p -D -m 644 "%{SOURCE10}" %{buildroot}%{_sysconfdir}/sysconfig/%{daemonshard}
@@ -325,8 +329,8 @@ fi
%dir %attr(0750, %{pkg_name}, root) %{_localstatedir}/log/%{pkg_name}
%dir %attr(0750, %{pkg_name}, root) %{_localstatedir}/run/%{pkg_name}
%config(noreplace) %{_sysconfdir}/logrotate.d/%{pkg_name}
-%config(noreplace) %{_sysconfdir}/%{pkg_name}.conf
-%config(noreplace) %{_sysconfdir}/%{pkg_name}-shard.conf
+%config(noreplace) %{_sysconfdir}/%{daemon}.conf
+%config(noreplace) %{_sysconfdir}/%{daemonshard}.conf
%config(noreplace) %{_sysconfdir}/sysconfig/%{daemon}
%config(noreplace) %{_sysconfdir}/sysconfig/%{daemonshard}
%if 0%{?fedora} >= 15 || 0%{?rhel} >= 7
@@ -339,17 +343,20 @@ fi
%ifarch %{ix86} x86_64
%files test
+%doc %{_datadir}/%{pkg_name}-test/README
%dir %attr(0755, %{pkg_name}, root) %{_datadir}/%{pkg_name}-test
-%dir %attr(0777, %{pkg_name}, root) %{_datadir}/%{pkg_name}-test/var
+%dir %attr(0755, %{pkg_name}, root) %{_datadir}/%{pkg_name}-test/var
%dir %attr(0755, %{pkg_name}, root) %{_datadir}/%{pkg_name}-test/jstests
-%{_datadir}/%{name}-test/smoke.*
-%{_datadir}/%{name}-test/cleanbb.*
-%{_datadir}/%{name}-test/utils.*
-%{_datadir}/%{name}-test/jstests/*
-%{_datadir}/%{name}-test/README
+%{_datadir}/%{pkg_name}-test/smoke.*
+%{_datadir}/%{pkg_name}-test/cleanbb.*
+%{_datadir}/%{pkg_name}-test/utils.*
+%{_datadir}/%{pkg_name}-test/jstests/*
%endif
%changelog
+* Wed Feb 4 2015 Marek Skalicky <mskalick at redhat.com> - 2.6.7-3
+- Changed names of configuration and log files
+
* Wed Jan 28 2015 Petr Machata <pmachata at redhat.com> - 2.6.7-2
- Rebuild for boost 1.57.0
- include <algorithm> in src/mongo/shell/linenoise_utf8.h
diff --git a/mongodb-shard.conf b/mongos.conf
similarity index 98%
rename from mongodb-shard.conf
rename to mongos.conf
index 9a1260f..d363059 100644
--- a/mongodb-shard.conf
+++ b/mongos.conf
@@ -15,7 +15,7 @@ fork = true
pidfilepath = /var/run/mongodb/mongos.pid
# Log file to send write to instead of stdout - has to be a file, not directory
-logpath = /var/log/mongodb/mongodb-shard.log
+logpath = /var/log/mongodb/mongos.log
# Alternative directory for UNIX domain sockets (defaults to /tmp)
unixSocketPrefix = /var/run/mongodb
diff --git a/mongos.init b/mongos.init
index 48aee23..38fca76 100644
--- a/mongos.init
+++ b/mongos.init
@@ -11,7 +11,7 @@
exec="/usr/bin/mongos"
prog="mongos"
-logfile="/var/log/mongodb/mongodb-shard.log"
+logfile="/var/log/mongodb/mongos.log"
[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
diff --git a/mongos.sysconf b/mongos.sysconf
index 203c64b..11a1ead 100644
--- a/mongos.sysconf
+++ b/mongos.sysconf
@@ -1 +1 @@
-OPTIONS="-f /etc/mongodb-shard.conf"
+OPTIONS="-f /etc/mongos.conf"
More information about the scm-commits
mailing list