diff --git a/net-im/palaver/files/palaver-confd b/net-im/palaver/files/palaver-confd index 8c2bf21..7635e51 100644 --- a/net-im/palaver/files/palaver-confd +++ b/net-im/palaver/files/palaver-confd @@ -1,2 +1,2 @@ # location of the configuration file -CONFIG=/etc/jabber/palaver.xml +CONFIG=/etc/jabber/palaver.conf diff --git a/net-im/palaver/files/palaver-initd b/net-im/palaver/files/palaver-initd index 903ad86..bf48b8b 100644 --- a/net-im/palaver/files/palaver-initd +++ b/net-im/palaver/files/palaver-initd @@ -10,9 +10,10 @@ depend() { start() { ebegin "Starting Palaver MUC service" + source ${CONFIG} start-stop-daemon --start --pidfile /var/run/jabber/palaver.pid -u jabber -g jabber \ - --exec /usr/bin/twistd -- -l /var/log/jabber/palaver.log --pidfile /var/run/jabber/palaver.pid \ - palaver -c ${CONFIG} + --exec /usr/bin/twistd -- -l $LOG/palaver.log --pidfile /var/run/jabber/palaver.pid \ + palaver --jid=$JID --rhost=$RHOST --rport=$RPORT --secret=$SECRET --spool=$SPOOL eend $? } diff --git a/net-im/palaver/files/palaver.conf b/net-im/palaver/files/palaver.conf new file mode 100644 index 0000000..a92c30e --- /dev/null +++ b/net-im/palaver/files/palaver.conf @@ -0,0 +1,6 @@ +JID=conference.example.com +RHOST=localhost +RPORT=5347 +SECRET=password +SPOOL=/var/spool/jabber/ +LOG=/var/log/jabber/ diff --git a/net-im/palaver/palaver-9999.ebuild b/net-im/palaver/palaver-9999.ebuild index 9fc6528..6e65098 100644 --- a/net-im/palaver/palaver-9999.ebuild +++ b/net-im/palaver/palaver-9999.ebuild @@ -38,18 +38,18 @@ src_install() { distutils_src_install insinto /etc/jabber - newins example-config.xml ${PN}.xml - fperms 600 /etc/jabber/${PN}.xml - fowners jabber:jabber /etc/jabber/${PN}.xml - dosed \ - "s:[^\<]*:/var/spool/jabber:" \ - /etc/jabber/${PN}.xml + newins "${FILESDIR}/"palaver.conf ${PN}.conf + fperms 600 /etc/jabber/${PN}.conf + fowners jabber:jabber /etc/jabber/${PN}.conf +# dosed \ +# "s:[^\<]*:/var/spool/jabber:" \ +# /etc/jabber/${PN}.xml newinitd "${FILESDIR}/${PN}-initd" ${PN} newconfd "${FILESDIR}/${PN}-confd" ${PN} } pkg_postinst() { - einfo "A sample config file has been installed into /etc/jabber/${PN}.xml." + einfo "A sample config file has been installed into /etc/jabber/${PN}.conf." einfo "Please adjust the settings as needed." }