Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing

diff --git a/scripts/sendemail.php b/scripts/sendemail.php
new file mode 100755 (executable)
index 0000000..436e085
--- /dev/null
+++ b/scripts/sendemail.php
@@ -0,0 +1,82 @@
+#!/usr/bin/env php
+<?php
+/*
+ * StatusNet - a distributed open-source microblogging tool
+ * Copyright (C) 2008, 2009, StatusNet, Inc.
+ *
+ * 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/>.
+ */
+
+define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
+
+$shortoptions = 'i:n:';
+$longoptions = array('id=', 'nickname=', 'subject=');
+
+$helptext = <<<END_OF_USEREMAIL_HELP
+sendemail.php [options] < <message body>
+Sends given email text to user.
+
+  -i --id       id of the user to query
+  -n --nickname nickname of the user to query
+     --subject  mail subject line (required)
+
+END_OF_USEREMAIL_HELP;
+
+require_once INSTALLDIR.'/scripts/commandline.inc';
+
+if (have_option('i', 'id')) {
+    $id = get_option_value('i', 'id');
+    $user = User::staticGet('id', $id);
+    if (empty($user)) {
+        print "Can't find user with ID $id\n";
+        exit(1);
+    }
+} else if (have_option('n', 'nickname')) {
+    $nickname = get_option_value('n', 'nickname');
+    $user = User::staticGet('nickname', $nickname);
+    if (empty($user)) {
+        print "Can't find user with nickname '$nickname'\n";
+        exit(1);
+    }
+} else {
+    print "You must provide a user by --id or --nickname\n";
+    exit(1);
+}
+
+if (empty($user->email)) {
+    // @fixme unconfirmed address?
+    print "No email registered for user '$user->nickname'\n";
+    exit(1);
+}
+
+if (!have_option('subject')) {
+    echo "You must provide a subject line for the mail in --subject='...' param.\n";
+    exit(1);
+}
+$subject = get_option_value('subject');
+
+if (posix_isatty(STDIN)) {
+    print "You must provide message input on stdin!\n";
+    exit(1);
+}
+$body = file_get_contents('php://stdin');
+
+print "Sending to $user->email...";
+if (mail_to_user($user, $subject, $body)) {
+    print " done\n";
+} else {
+    print " failed.\n";
+    exit(1);
+}
+

diff --git a/scripts/setup.cfg.sample b/scripts/setup.cfg.sample
index 8d03b06f5e8db8c13e00f8ee888195cc32fe3fe6..f247a3bcae0e6910eb709bfddee23fd61682014a 100644 (file)
--- a/scripts/setup.cfg.sample
+++ b/scripts/setup.cfg.sample
@@ -11,4 +11,8 @@ export AVATARBASE=/var/www/avatar.example.net
 export BACKGROUNDBASE=/var/www/background.example.net
 export FILEBASE=/var/www/file.example.net
 export PWDGEN="pwgen 20"
-
+export PHPBASE=/var/www/statusnet
+export WILDCARD=example.net
+export MAILTEMPLATE=/etc/statusnet/newsite-mail.txt
+export MAILSUBJECT="Your new StatusNet site"
+export POSTINSTALL=/etc/statusnet/morestuff.sh

diff --git a/scripts/setup_status_network.sh b/scripts/setup_status_network.sh
index 777711fb55a29d24f836e1b3bca8e2a602b3415c..ae392191f1475d2c413790bdd58f6859610368e7 100755 (executable)
--- a/scripts/setup_status_network.sh
+++ b/scripts/setup_status_network.sh
@@ -2,9 +2,22 @@
 
 source /etc/statusnet/setup.cfg
 
-export nickname=$1
-export sitename=$2
+# setup_status_net.sh mysite 'My Site' 'owner@example.com' '1user'
 
+export nickname="$1"
+export sitename="$2"
+export email="$3"
+export tags="$4"
+
+# Fixme: if this is changed later we need to update profile URLs
+# for the created user.
+export server="$nickname.$WILDCARD"
+
+# End-user info
+export userpass=`$PWDGEN`
+export roles="administrator moderator owner"
+
+# DB info
 export password=`$PWDGEN`
 export database=$nickname$DBBASE
 export username=$nickname$USERBASE
@@ -21,8 +34,8 @@ mysql -h $DBHOST -u $ADMIN --password=$ADMINPASS $SITEDB << ENDOFCOMMANDS
 
 GRANT ALL ON $database.* TO '$username'@'localhost' IDENTIFIED BY '$password';
 GRANT ALL ON $database.* TO '$username'@'%' IDENTIFIED BY '$password';
-INSERT INTO status_network (nickname, dbhost, dbuser, dbpass, dbname, sitename, created)
-VALUES ('$nickname', '$DBHOSTNAME', '$username', '$password', '$database', '$sitename', now());
+INSERT INTO status_network (nickname, dbhost, dbuser, dbpass, dbname, sitename, created, tags)
+VALUES ('$nickname', '$DBHOSTNAME', '$username', '$password', '$database', '$sitename', now(), '$tags');
 
 ENDOFCOMMANDS
 
@@ -30,3 +43,38 @@ for top in $AVATARBASE $FILEBASE $BACKGROUNDBASE; do
     mkdir $top/$nickname
     chmod a+w $top/$nickname
 done
+
+php $PHPBASE/scripts/registeruser.php \
+  -s"$server" \
+  -n"$nickname" \
+  -w"$userpass" \
+  -e"$email"
+
+for role in $roles
+do
+  php $PHPBASE/scripts/userrole.php \
+    -s"$server" \
+    -n"$nickname" \
+    -r"$role"
+done
+
+if [ -f "$MAILTEMPLATE" ]
+then
+    # fixme how safe is this? are sitenames sanitized?
+    cat $MAILTEMPLATE | \
+      sed "s/\$nickname/$nickname/" | \
+      sed "s/\$sitename/$sitename/" | \
+      sed "s/\$userpass/$userpass/" | \
+      php $PHPBASE/scripts/sendemail.php \
+        -s"$server" \
+        -n"$nickname" \
+        --subject="$MAILSUBJECT"
+else
+    echo "No mail template, not sending email."
+fi
+
+if [ -f "$POSTINSTALL" ]
+then
+    echo "Running $POSTINSTALL ..."
+    source "$POSTINSTALL"
+fi