diff --git a/net-im/palaver/files/palaver-confd b/net-im/palaver/files/palaver-confd new file mode 100644 index 0000000..8c2bf21 --- /dev/null +++ b/net-im/palaver/files/palaver-confd @@ -0,0 +1,2 @@ +# location of the configuration file +CONFIG=/etc/jabber/palaver.xml diff --git a/net-im/palaver/files/palaver-initd b/net-im/palaver/files/palaver-initd index d0dde8d..903ad86 100644 --- a/net-im/palaver/files/palaver-initd +++ b/net-im/palaver/files/palaver-initd @@ -11,8 +11,8 @@ depend() { start() { ebegin "Starting Palaver MUC service" start-stop-daemon --start --pidfile /var/run/jabber/palaver.pid -u jabber -g jabber \ - --exec /usr/bin/twistd -- -f /etc/jabber/palaver.tap -l /var/log/jabber/palaver.log \ - --pidfile /var/run/jabber/palaver.pid + --exec /usr/bin/twistd -- -l /var/log/jabber/palaver.log --pidfile /var/run/jabber/palaver.pid \ + palaver -c ${CONFIG} eend $? } diff --git a/net-im/palaver/palaver-9999.ebuild b/net-im/palaver/palaver-9999.ebuild index 2dd5f11..ba6e37a 100644 --- a/net-im/palaver/palaver-9999.ebuild +++ b/net-im/palaver/palaver-9999.ebuild @@ -38,19 +38,11 @@ src_install() { "s:[^\<]*:/var/spool/jabber:" \ /etc/jabber/${PN}.xml -# dosed \ -# "s:[^\<]*:/var/run/jabber/${PN}.pid:" \ -# /etc/jabber/${PN}.xml - newinitd "${FILESDIR}/${PN}-initd" ${PN} -# dosed "s:INSPATH:${inspath}:" /etc/init.d/${PN} - + newconfd "${FILESDIR}/${PN}-confd" ${PN} } pkg_postinst() { einfo "A sample config file has been installed into /etc/jabber/${PN}.xml." einfo "Please adjust the settings as needed." - einfo "After that, you MUST create a TAP-file for twisted in order to start Palaver, like this:" - einfo "# cd /etc/jabber" - einfo "# mktap palaver -c palaver.xml" }