Patchwork contrib: add a systemd service file for rpc.fedfsd (try #2)

login
register
mail settings
Submitter Jeff Layton
Date Nov. 9, 2011, 10:47 a.m.
Message ID <1320835644-21264-1-git-send-email-jlayton@redhat.com>
Download mbox | patch
Permalink /patch/124521/
State Superseded
Headers show

Comments

Jeff Layton - Nov. 9, 2011, 10:47 a.m.
...this version also makes it source in /etc/sysconfig/fedfs before
starting the daemon so that the user can set $RPCFEDFSDARGS.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
---
 configure.ac                      |    1 +
 contrib/Makefile.am               |    2 +-
 contrib/systemd/Makefile.am       |   29 +++++++++++++++++++++++++++++
 contrib/systemd/rpcfedfsd.service |   29 +++++++++++++++++++++++++++++
 4 files changed, 60 insertions(+), 1 deletions(-)
 create mode 100644 contrib/systemd/Makefile.am
 create mode 100644 contrib/systemd/rpcfedfsd.service
Chuck Lever - Nov. 9, 2011, 10:12 p.m.
On Nov 9, 2011, at 5:47 AM, Jeff Layton wrote:

> ...this version also makes it source in /etc/sysconfig/fedfs before
> starting the daemon so that the user can set $RPCFEDFSDARGS.

Excellent, thanks.

One more nit: I wonder if we really need to put this in a separate directory hierarchy.  Is there a strong reason we can't just slot the new .service file into contrib/init-scripts ?  We can consider renaming the init-scripts directory to something more generic (like init/) if you prefer.

> Signed-off-by: Jeff Layton <jlayton@redhat.com>
> ---
> configure.ac                      |    1 +
> contrib/Makefile.am               |    2 +-
> contrib/systemd/Makefile.am       |   29 +++++++++++++++++++++++++++++
> contrib/systemd/rpcfedfsd.service |   29 +++++++++++++++++++++++++++++
> 4 files changed, 60 insertions(+), 1 deletions(-)
> create mode 100644 contrib/systemd/Makefile.am
> create mode 100644 contrib/systemd/rpcfedfsd.service
> 
> diff --git a/configure.ac b/configure.ac
> index b26a4a7..9a93e81 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -150,6 +150,7 @@ AC_SUBST([root_sbindir])
> AC_CONFIG_FILES([Makefile
>                  contrib/Makefile
>                  contrib/init-scripts/Makefile
> +                 contrib/systemd/Makefile
>                  doc/Makefile
>                  doc/ldap/Makefile
>                  doc/man/Makefile
> diff --git a/contrib/Makefile.am b/contrib/Makefile.am
> index 7d68051..9ce39e9 100644
> --- a/contrib/Makefile.am
> +++ b/contrib/Makefile.am
> @@ -23,7 +23,7 @@
> ##	http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
> ##
> 
> -SUBDIRS			= init-scripts
> +SUBDIRS			= init-scripts systemd
> 
> CLEANFILES		= cscope.in.out cscope.out cscope.po.out *~
> DISTCLEANFILES		= Makefile.in
> diff --git a/contrib/systemd/Makefile.am b/contrib/systemd/Makefile.am
> new file mode 100644
> index 0000000..217edda
> --- /dev/null
> +++ b/contrib/systemd/Makefile.am
> @@ -0,0 +1,29 @@
> +##
> +## @file contrib/systemd/Makefile.am
> +## @brief Process this file with automake to produce contrib/systemd/Makefile.in
> +##
> +
> +##
> +## Copyright 2011 Red Hat.  All rights reserved.
> +##
> +## This file is part of fedfs-utils.
> +##
> +## fedfs-utils is free software; you can redistribute it and/or modify
> +## it under the terms of the GNU General Public License version 2.0 as
> +## published by the Free Software Foundation.
> +##
> +## fedfs-utils is distributed in the hope that it will be useful, but
> +## WITHOUT ANY WARRANTY; without even the implied warranty of
> +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> +## GNU General Public License version 2.0 for more details.
> +##
> +## You should have received a copy of the GNU General Public License
> +## version 2.0 along with fedfs-utils.  If not, see:
> +##
> +##	http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
> +##
> +
> +EXTRA_DIST		= rpcfedfsd.service
> +
> +CLEANFILES		= cscope.in.out cscope.out cscope.po.out *~
> +DISTCLEANFILES		= Makefile.in
> diff --git a/contrib/systemd/rpcfedfsd.service b/contrib/systemd/rpcfedfsd.service
> new file mode 100644
> index 0000000..f41e013
> --- /dev/null
> +++ b/contrib/systemd/rpcfedfsd.service
> @@ -0,0 +1,29 @@
> +##
> +## Copyright 2011 Red Hat.  All rights reserved.
> +##
> +## rpcfedfsd.service is free software; you can redistribute it and/or modify
> +## it under the terms of the GNU General Public License version 2.0 as
> +## published by the Free Software Foundation.
> +##
> +## rpcfedfsd.service is distributed in the hope that it will be useful, but
> +## WITHOUT ANY WARRANTY; without even the implied warranty of
> +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> +## GNU General Public License version 2.0 for more details.
> +##
> +## A copy of the GNU General Public License version 2.0 is
> +## available here:
> +##
> +##      http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
> +##
> +
> +[Unit]
> +Description=FedFS administrative service daemon
> +After=syslog.target
> +
> +[Service]
> +EnvironmentFile=-/etc/sysconfig/fedfs
> +ExecStart=/usr/sbin/rpc.fedfsd $RPCFEDFSDARGS
> +Type=forking
> +
> +[Install]
> +WantedBy=multi-user.target
> -- 
> 1.7.6.4
>
Jeff Layton - Nov. 9, 2011, 11:58 p.m.
On Wed, 9 Nov 2011 17:12:01 -0500
Chuck Lever <chuck.lever@oracle.com> wrote:

> 
> On Nov 9, 2011, at 5:47 AM, Jeff Layton wrote:
> 
> > ...this version also makes it source in /etc/sysconfig/fedfs before
> > starting the daemon so that the user can set $RPCFEDFSDARGS.
> 
> Excellent, thanks.
> 
> One more nit: I wonder if we really need to put this in a separate directory hierarchy.  Is there a strong reason we can't just slot the new .service file into contrib/init-scripts ?  We can consider renaming the init-scripts directory to something more generic (like init/) if you prefer.
> 

I only made new dir because it didn't seem to fit into an
"init-scripts" dir. If you'd prefer to rename that dir to "init" and
drop this in there, then that's fine with me.


> > Signed-off-by: Jeff Layton <jlayton@redhat.com>
> > ---
> > configure.ac                      |    1 +
> > contrib/Makefile.am               |    2 +-
> > contrib/systemd/Makefile.am       |   29 +++++++++++++++++++++++++++++
> > contrib/systemd/rpcfedfsd.service |   29 +++++++++++++++++++++++++++++
> > 4 files changed, 60 insertions(+), 1 deletions(-)
> > create mode 100644 contrib/systemd/Makefile.am
> > create mode 100644 contrib/systemd/rpcfedfsd.service
> > 
> > diff --git a/configure.ac b/configure.ac
> > index b26a4a7..9a93e81 100644
> > --- a/configure.ac
> > +++ b/configure.ac
> > @@ -150,6 +150,7 @@ AC_SUBST([root_sbindir])
> > AC_CONFIG_FILES([Makefile
> >                  contrib/Makefile
> >                  contrib/init-scripts/Makefile
> > +                 contrib/systemd/Makefile
> >                  doc/Makefile
> >                  doc/ldap/Makefile
> >                  doc/man/Makefile
> > diff --git a/contrib/Makefile.am b/contrib/Makefile.am
> > index 7d68051..9ce39e9 100644
> > --- a/contrib/Makefile.am
> > +++ b/contrib/Makefile.am
> > @@ -23,7 +23,7 @@
> > ##	http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
> > ##
> > 
> > -SUBDIRS			= init-scripts
> > +SUBDIRS			= init-scripts systemd
> > 
> > CLEANFILES		= cscope.in.out cscope.out cscope.po.out *~
> > DISTCLEANFILES		= Makefile.in
> > diff --git a/contrib/systemd/Makefile.am b/contrib/systemd/Makefile.am
> > new file mode 100644
> > index 0000000..217edda
> > --- /dev/null
> > +++ b/contrib/systemd/Makefile.am
> > @@ -0,0 +1,29 @@
> > +##
> > +## @file contrib/systemd/Makefile.am
> > +## @brief Process this file with automake to produce contrib/systemd/Makefile.in
> > +##
> > +
> > +##
> > +## Copyright 2011 Red Hat.  All rights reserved.
> > +##
> > +## This file is part of fedfs-utils.
> > +##
> > +## fedfs-utils is free software; you can redistribute it and/or modify
> > +## it under the terms of the GNU General Public License version 2.0 as
> > +## published by the Free Software Foundation.
> > +##
> > +## fedfs-utils is distributed in the hope that it will be useful, but
> > +## WITHOUT ANY WARRANTY; without even the implied warranty of
> > +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> > +## GNU General Public License version 2.0 for more details.
> > +##
> > +## You should have received a copy of the GNU General Public License
> > +## version 2.0 along with fedfs-utils.  If not, see:
> > +##
> > +##	http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
> > +##
> > +
> > +EXTRA_DIST		= rpcfedfsd.service
> > +
> > +CLEANFILES		= cscope.in.out cscope.out cscope.po.out *~
> > +DISTCLEANFILES		= Makefile.in
> > diff --git a/contrib/systemd/rpcfedfsd.service b/contrib/systemd/rpcfedfsd.service
> > new file mode 100644
> > index 0000000..f41e013
> > --- /dev/null
> > +++ b/contrib/systemd/rpcfedfsd.service
> > @@ -0,0 +1,29 @@
> > +##
> > +## Copyright 2011 Red Hat.  All rights reserved.
> > +##
> > +## rpcfedfsd.service is free software; you can redistribute it and/or modify
> > +## it under the terms of the GNU General Public License version 2.0 as
> > +## published by the Free Software Foundation.
> > +##
> > +## rpcfedfsd.service is distributed in the hope that it will be useful, but
> > +## WITHOUT ANY WARRANTY; without even the implied warranty of
> > +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> > +## GNU General Public License version 2.0 for more details.
> > +##
> > +## A copy of the GNU General Public License version 2.0 is
> > +## available here:
> > +##
> > +##      http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
> > +##
> > +
> > +[Unit]
> > +Description=FedFS administrative service daemon
> > +After=syslog.target
> > +
> > +[Service]
> > +EnvironmentFile=-/etc/sysconfig/fedfs
> > +ExecStart=/usr/sbin/rpc.fedfsd $RPCFEDFSDARGS
> > +Type=forking
> > +
> > +[Install]
> > +WantedBy=multi-user.target
> > -- 
> > 1.7.6.4
> > 
>

Patch

diff --git a/configure.ac b/configure.ac
index b26a4a7..9a93e81 100644
--- a/configure.ac
+++ b/configure.ac
@@ -150,6 +150,7 @@  AC_SUBST([root_sbindir])
 AC_CONFIG_FILES([Makefile
                  contrib/Makefile
                  contrib/init-scripts/Makefile
+                 contrib/systemd/Makefile
                  doc/Makefile
                  doc/ldap/Makefile
                  doc/man/Makefile
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index 7d68051..9ce39e9 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -23,7 +23,7 @@ 
 ##	http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
 ##
 
-SUBDIRS			= init-scripts
+SUBDIRS			= init-scripts systemd
 
 CLEANFILES		= cscope.in.out cscope.out cscope.po.out *~
 DISTCLEANFILES		= Makefile.in
diff --git a/contrib/systemd/Makefile.am b/contrib/systemd/Makefile.am
new file mode 100644
index 0000000..217edda
--- /dev/null
+++ b/contrib/systemd/Makefile.am
@@ -0,0 +1,29 @@ 
+##
+## @file contrib/systemd/Makefile.am
+## @brief Process this file with automake to produce contrib/systemd/Makefile.in
+##
+
+##
+## Copyright 2011 Red Hat.  All rights reserved.
+##
+## This file is part of fedfs-utils.
+##
+## fedfs-utils is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License version 2.0 as
+## published by the Free Software Foundation.
+##
+## fedfs-utils is distributed in the hope that it will be useful, but
+## WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License version 2.0 for more details.
+##
+## You should have received a copy of the GNU General Public License
+## version 2.0 along with fedfs-utils.  If not, see:
+##
+##	http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
+##
+
+EXTRA_DIST		= rpcfedfsd.service
+
+CLEANFILES		= cscope.in.out cscope.out cscope.po.out *~
+DISTCLEANFILES		= Makefile.in
diff --git a/contrib/systemd/rpcfedfsd.service b/contrib/systemd/rpcfedfsd.service
new file mode 100644
index 0000000..f41e013
--- /dev/null
+++ b/contrib/systemd/rpcfedfsd.service
@@ -0,0 +1,29 @@ 
+##
+## Copyright 2011 Red Hat.  All rights reserved.
+##
+## rpcfedfsd.service is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License version 2.0 as
+## published by the Free Software Foundation.
+##
+## rpcfedfsd.service is distributed in the hope that it will be useful, but
+## WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License version 2.0 for more details.
+##
+## A copy of the GNU General Public License version 2.0 is
+## available here:
+##
+##      http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
+##
+
+[Unit]
+Description=FedFS administrative service daemon
+After=syslog.target
+
+[Service]
+EnvironmentFile=-/etc/sysconfig/fedfs
+ExecStart=/usr/sbin/rpc.fedfsd $RPCFEDFSDARGS
+Type=forking
+
+[Install]
+WantedBy=multi-user.target