# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1485289443 -3600
# Node ID 58dbe5afeb4abc77a6a442b44a771bdcd3a9d398
# Parent  9eb13c14eaabb53239b47efcb977b0f14b4b9906# Parent  49ff363f3a3db4d12c2aeffc7b0fe875cbfd8f4b
Merge 0.10->trunk

diff -r 9eb13c14eaab -r 58dbe5afeb4a plugins/mod_watchregistrations.lua
--- a/plugins/mod_watchregistrations.lua	Tue Jan 24 19:27:17 2017 +0100
+++ b/plugins/mod_watchregistrations.lua	Tue Jan 24 21:24:03 2017 +0100
@@ -11,13 +11,14 @@
 local jid_prep = require "util.jid".prep;
 
 local registration_watchers = module:get_option_set("registration_watchers", module:get_option("admins", {})) / jid_prep;
+local registration_from = module:get_option_string("registration_from", host);
 local registration_notification = module:get_option_string("registration_notification", "User $username just registered on $host from $ip");
 
 local st = require "util.stanza";
 
 module:hook("user-registered", function (user)
 	module:log("debug", "Notifying of new registration");
-	local message = st.message{ type = "chat", from = host }
+	local message = st.message{ type = "chat", from = registration_from }
 		:tag("body")
 			:text(registration_notification:gsub("%$(%w+)", function (v)
 				return user[v] or user.session and user.session[v] or nil;