diff options
| -rw-r--r-- | net-im/ejabberd/ejabberd-16.04.ebuild | 4 | ||||
| -rw-r--r-- | net-im/ejabberd/files/ejabberd.confd (renamed from net-im/ejabberd/files/ejabberd-3.confd) | 0 | ||||
| -rw-r--r-- | net-im/ejabberd/files/ejabberd.initd (renamed from net-im/ejabberd/files/ejabberd-3.initd) | 2 | ||||
| -rw-r--r-- | net-im/ejabberd/files/ejabberd.service | 17 |
4 files changed, 3 insertions, 20 deletions
diff --git a/net-im/ejabberd/ejabberd-16.04.ebuild b/net-im/ejabberd/ejabberd-16.04.ebuild index 7fd509dcef46..211f21d76099 100644 --- a/net-im/ejabberd/ejabberd-16.04.ebuild +++ b/net-im/ejabberd/ejabberd-16.04.ebuild @@ -224,8 +224,8 @@ src_install() { fperms 4750 "${epam_path}" fi - newconfd "${FILESDIR}/${PN}-3.confd" "${PN}" - newinitd "${FILESDIR}/${PN}-3.initd" "${PN}" + newconfd "${FILESDIR}/${PN}.confd" "${PN}" + newinitd "${FILESDIR}/${PN}.initd" "${PN}" systemd_dounit "${PN}.service" systemd_dotmpfilesd "${FILESDIR}/${PN}.tmpfiles.conf" diff --git a/net-im/ejabberd/files/ejabberd-3.confd b/net-im/ejabberd/files/ejabberd.confd index b1e984e4d7ab..b1e984e4d7ab 100644 --- a/net-im/ejabberd/files/ejabberd-3.confd +++ b/net-im/ejabberd/files/ejabberd.confd diff --git a/net-im/ejabberd/files/ejabberd-3.initd b/net-im/ejabberd/files/ejabberd.initd index 2827aeb43d42..aed39b87b052 100644 --- a/net-im/ejabberd/files/ejabberd-3.initd +++ b/net-im/ejabberd/files/ejabberd.initd @@ -1,5 +1,5 @@ #!/sbin/openrc-run -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ diff --git a/net-im/ejabberd/files/ejabberd.service b/net-im/ejabberd/files/ejabberd.service deleted file mode 100644 index 0b792565b75e..000000000000 --- a/net-im/ejabberd/files/ejabberd.service +++ /dev/null @@ -1,17 +0,0 @@ -[Unit] -Description=A distributed, fault-tolerant Jabber/XMPP server -After=network.target - -[Service] -Type=oneshot -User=jabber -LimitNOFILE=16000 -RestartSec=5 -ExecStart=/usr/sbin/ejabberdctl \ - --config /etc/jabber/ejabberd.cfg --ctl-config /etc/jabber/ejabberdctl.cfg \ - --logs "/var/log/jabber" --spool "/var/spool/jabber" start -ExecStop=/usr/sbin/ejabberdctl stop -RemainAfterExit=yes - -[Install] -WantedBy=multi-user.target |