diff options
| author | Ernie Hershey <ernie.hershey@10gen.com> | 2013-09-17 16:04:50 -0400 |
|---|---|---|
| committer | Ernie Hershey <ernie.hershey@10gen.com> | 2013-09-25 21:41:28 -0400 |
| commit | e01dfe96c73e89fb5e20f55faff4fcbfb54de1b5 (patch) | |
| tree | 48817d5d62c3bd3199683125449a0b26eaff69b1 /debian | |
| parent | d32637303b9dedd812d8bc9c10b173755e3602eb (diff) | |
| download | mongo-e01dfe96c73e89fb5e20f55faff4fcbfb54de1b5.tar.gz | |
SERVER-3579 Change file paths to consistent format
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/init.d | 2 | ||||
| -rw-r--r-- | debian/mongod.conf (renamed from debian/mongodb.conf) | 2 | ||||
| -rw-r--r-- | debian/mongodb-org-unstable-server.postinst | 4 | ||||
| -rw-r--r-- | debian/mongodb.upstart | 4 | ||||
| -rw-r--r-- | debian/rules | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/debian/init.d b/debian/init.d index fce25a3b3b4..85aa24e84a7 100644 --- a/debian/init.d +++ b/debian/init.d @@ -54,7 +54,7 @@ NAME=mongodb # Defaults. Can be overridden by the /etc/default/$NAME # Other configuration options are located in $CONF file. See here for more: # http://dochub.mongodb.org/core/configurationoptions -CONF=/etc/mongodb.conf +CONF=/etc/mongod.conf PIDFILE=/var/run/$NAME.pid ENABLE_MONGODB=yes diff --git a/debian/mongodb.conf b/debian/mongod.conf index e4485b2f10f..da78d2b7817 100644 --- a/debian/mongodb.conf +++ b/debian/mongod.conf @@ -1,4 +1,4 @@ -# mongodb.conf +# mongod.conf # Where to store the data. diff --git a/debian/mongodb-org-unstable-server.postinst b/debian/mongodb-org-unstable-server.postinst index 4d0e786ef87..b9700a1232f 100644 --- a/debian/mongodb-org-unstable-server.postinst +++ b/debian/mongodb-org-unstable-server.postinst @@ -27,11 +27,11 @@ case "$1" in adduser mongodb mongodb fi - # create db -- note: this should agree with dbpath in mongodb.conf + # create db -- note: this should agree with dbpath in mongod.conf mkdir -p /var/lib/mongodb chown -R mongodb:mongodb /var/lib/mongodb - # create logdir -- note: this should agree with logpath in mongodb.conf + # create logdir -- note: this should agree with logpath in mongod.conf mkdir -p /var/log/mongodb chown -R mongodb:mongodb /var/log/mongodb ;; diff --git a/debian/mongodb.upstart b/debian/mongodb.upstart index 1fc9969fe39..9a3b50835af 100644 --- a/debian/mongodb.upstart +++ b/debian/mongodb.upstart @@ -1,4 +1,4 @@ -# Ubuntu upstart file at /etc/init/mongodb.conf +# Ubuntu upstart file at /etc/init/mongod.conf limit nofile 20000 20000 @@ -15,5 +15,5 @@ stop on runlevel [06] script ENABLE_MONGODB="yes" if [ -f /etc/default/mongodb ]; then . /etc/default/mongodb; fi - if [ "x$ENABLE_MONGODB" = "xyes" ]; then exec start-stop-daemon --start --quiet --chuid mongodb --exec /usr/bin/mongod -- --config /etc/mongodb.conf; fi + if [ "x$ENABLE_MONGODB" = "xyes" ]; then exec start-stop-daemon --start --quiet --chuid mongodb --exec /usr/bin/mongod -- --config /etc/mongod.conf; fi end script diff --git a/debian/rules b/debian/rules index 32ecf463888..ee0ec73414c 100644 --- a/debian/rules +++ b/debian/rules @@ -108,7 +108,7 @@ install: build cp -v $(CURDIR)/BINARIES/usr/bin/mongotop $(CURDIR)/debian/mongodb-org-unstable-tools/usr/bin mkdir -p $(CURDIR)/debian/mongodb-org-unstable-server/etc - cp $(CURDIR)/debian/mongodb.conf $(CURDIR)/debian/mongodb-org-unstable-server/etc/mongodb.conf + cp $(CURDIR)/debian/mongod.conf $(CURDIR)/debian/mongodb-org-unstable-server/etc/mongod.conf mkdir -p $(CURDIR)/debian/mongodb-org-unstable-shell/usr/share/lintian/overrides/ mkdir -p $(CURDIR)/debian/mongodb-org-unstable-server/usr/share/lintian/overrides/ |