[couchdb] Improve systemd support
Peter Lemenkov
peter at fedoraproject.org
Wed Jul 4 19:28:14 UTC 2012
commit 89b14cd8f0c1e1a57541363ad9181b4bd662bcdc
Author: Peter Lemenkov <lemenkov at gmail.com>
Date: Wed Jul 4 23:28:08 2012 +0400
Improve systemd support
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
couchdb.service | 13 +++++++++----
couchdb.spec | 13 ++++++++-----
couchdb.tmpfiles.conf | 1 +
3 files changed, 18 insertions(+), 9 deletions(-)
---
diff --git a/couchdb.service b/couchdb.service
index 62ad9d1..410e3a0 100644
--- a/couchdb.service
+++ b/couchdb.service
@@ -4,10 +4,15 @@ After=network.target
[Service]
User=couchdb
-Type=forking
-EnvironmentFile=-/etc/sysconfig/couchdb
-PIDFile=/run/couchdb/couchdb.pid
-ExecStart=/usr/bin/couchdb -r $COUCHDB_RESPAWN_TIMEOUT -o $COUCHDB_STDOUT_FILE -e $COUCHDB_STDERR_FILE $COUCHDB_OPTIONS -b
+Group=couchdb
+Type=simple
+StandardOutput=journal
+StandardError=journal
+Restart=always
+StartLimitInterval=10
+StartLimitBurst=5
+PIDFile=/var/run/couchdb/couchdb.pid
+ExecStart=/usr/bin/erl +Bd -noinput -sasl errlog_type error +K true +A 4 -couch_ini /etc/couchdb/default.ini /etc/couchdb/local.ini -s couch -pidfile /var/run/couchdb/couchdb.pid -heart
[Install]
WantedBy=multi-user.target
diff --git a/couchdb.spec b/couchdb.spec
index fce3592..a86a0ca 100644
--- a/couchdb.spec
+++ b/couchdb.spec
@@ -4,7 +4,7 @@
Name: couchdb
Version: 1.1.1
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: A document database server, accessible via a RESTful JSON API
Group: Applications/Databases
@@ -13,6 +13,7 @@ URL: http://couchdb.apache.org/
Source0: http://www.apache.org/dist/%{name}/%{version}/apache-%{name}-%{version}.tar.gz
Source1: %{name}.init
Source2: %{name}.service
+Source3: %{name}.tmpfiles.conf
Patch1: couchdb-0001-Do-not-gzip-doc-files-and-do-not-install-installatio.patch
Patch2: couchdb-0002-Install-docs-into-versioned-directory.patch
Patch3: couchdb-0003-More-directories-to-search-for-place-for-init-script.patch
@@ -117,10 +118,9 @@ install -D -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/%{name}
# Use /etc/sysconfig instead of /etc/default
mv $RPM_BUILD_ROOT%{_sysconfdir}/{default,sysconfig}
-# create /etc/tmpfiles.d entry
+# Install /etc/tmpfiles.d entry
%if 0%{?fedora} > 14
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/tmpfiles.d
-echo "d /var/run/couchdb 0755 %{couchdb_user} root" > $RPM_BUILD_ROOT%{_sysconfdir}/tmpfiles.d/%{name}.conf
+install -D -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/tmpfiles.d/%{name}.conf
%endif
@@ -198,7 +198,6 @@ fi
%dir %{_sysconfdir}/%{name}/default.d
%config(noreplace) %attr(0644, %{couchdb_user}, root) %{_sysconfdir}/%{name}/default.ini
%config(noreplace) %attr(0644, %{couchdb_user}, root) %{_sysconfdir}/%{name}/local.ini
-%config(noreplace) %{_sysconfdir}/sysconfig/%{name}
%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
%if 0%{?fedora} > 14
%{_sysconfdir}/tmpfiles.d/%{name}.conf
@@ -206,6 +205,7 @@ fi
%if 0%{?fedora} > 16
%{_unitdir}/%{name}.service
%else
+%config(noreplace) %{_sysconfdir}/sysconfig/%{name}
%{_initrddir}/%{name}
%endif
%{_bindir}/%{name}
@@ -220,6 +220,9 @@ fi
%changelog
+* Wed Jul 04 2012 Peter Lemenkov <lemenkov at gmail.com> - 1.1.1-3
+- Improve systemd support
+
* Wed May 16 2012 Peter Lemenkov <lemenkov at gmail.com> - 1.1.1-2
- Updated systemd files (added EnvironmentFile option)
diff --git a/couchdb.tmpfiles.conf b/couchdb.tmpfiles.conf
new file mode 100644
index 0000000..b8d7201
--- /dev/null
+++ b/couchdb.tmpfiles.conf
@@ -0,0 +1 @@
+d /var/run/couchdb 0755 couchdb couchdb
More information about the scm-commits
mailing list