Merge pull request #66 from jvalleroy/xmpp-hostname

Update XMPP and mDNS when changing hostname
This commit is contained in:
Nick Daly 2014-04-18 01:28:21 +00:00
commit bd5f5c390a
4 changed files with 75 additions and 0 deletions

View File

@ -8,3 +8,5 @@ if [ -x /etc/init.d/hostname.sh ] ; then
else
service hostname start
fi
service avahi-daemon restart

43
actions/xmpp-hostname-change Executable file
View File

@ -0,0 +1,43 @@
#!/bin/bash
#
# This file is part of Plinth.
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
# published by the Free Software Foundation, either version 3 of the
# License, or (at your option) any later version.
#
# This program 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 Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
# Action to set up new hostname for ejabberd and jwchat.
hostname="$1"
old_hostname=`debconf-show ejabberd | awk '/hostname/ { print $3 }'`
# Based on http://www.process-one.net/docs/ejabberd/guide_en.html#htoc77
# Setup some variables
BACKUP=/tmp/ejabberd.dump
echo "ejabberd ejabberd/hostname string $hostname" | debconf-set-selections
echo "jwchat jwchat/ApacheServerName string $hostname" | debconf-set-selections
DEBIAN_FRONTEND=noninteractive dpkg-reconfigure jwchat
# Debconf can't handle our manual changes to ejabberd's config yet.
sed -i "s/$old_hostname/$hostname/g" /etc/ejabberd/ejabberd.cfg
sed -i "s/$old_hostname/$hostname/g" $BACKUP
service ejabberd restart
# Load backup database
sleep 10
ejabberdctl load $BACKUP
rm $BACKUP

View File

@ -0,0 +1,28 @@
#!/bin/sh
#
# This file is part of Plinth.
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
# published by the Free Software Foundation, either version 3 of the
# License, or (at your option) any later version.
#
# This program 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 Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
# Action to backup ejabberd database before changing hostname.
BACKUP=/tmp/ejabberd.dump
ejabberdctl dump $BACKUP
ejabberdctl stop
# Make sure there aren't files in the Mnesia spool dir
mkdir -p /var/lib/ejabberd/oldfiles
mv /var/lib/ejabberd/*.* /var/lib/ejabberd/oldfiles/

View File

@ -55,7 +55,9 @@ def set_hostname(hostname):
cfg.log.info("Changing hostname to '%s'" % hostname)
try:
superuser_run("xmpp-pre-hostname-change")
superuser_run("hostname-change", hostname)
superuser_run("xmpp-hostname-change", hostname, async=True)
# don't persist/cache change unless it was saved successfuly
sys_store = filedict_con(cfg.store_file, 'sys')
sys_store['hostname'] = hostname