Make stopdaemons.sh work with on multi-instance servers. So: - Allow specifying a...

[quix0rs-gnu-social.git] / scripts / install_cli.php

diff --git a/scripts/install_cli.php b/scripts/install_cli.php
index 61fbe18ef641fcaa9bd54ce8542f5e8d3b0d3e20..acdc38fabec70259d928ea3d6c03a7d42e1b6862 100755 (executable)
--- a/scripts/install_cli.php
+++ b/scripts/install_cli.php
@@ -21,8 +21,9 @@
  * @package  Installation
  *
  * @author   Brion Vibber <brion@status.net>
+ * @author   Mikael Nordfeldth <mmn@hethane.se>
  * @license  GNU Affero General Public License http://www.gnu.org/licenses/
- * @version  0.9.x
+ * @version  1.1.x
  * @link     http://status.net
  */
 
@@ -72,6 +73,7 @@ class CliInstaller extends Installer
             '--path'     => 'path',
             '--sitename' => 'sitename',
             '--fancy'    => 'fancy',
+            '--ssl'      => 'ssl',
 
             '--dbtype'   => 'dbtype',
             '--host'     => 'host',
@@ -82,7 +84,9 @@ class CliInstaller extends Installer
             '--admin-nick' => 'adminNick',
             '--admin-pass' => 'adminPass',
             '--admin-email' => 'adminEmail',
-            '--admin-updates' => 'adminUpdates'
+            '--admin-updates' => 'adminUpdates',
+
+            '--site-profile' => 'siteProfile'
         );
         foreach ($map as $arg => $target) {
             if (substr($arg, 0, 2) == '--') {
@@ -104,6 +108,7 @@ class CliInstaller extends Installer
         $this->dbtype = 'mysql';
         $this->adminUpdates = true;
         $this->verbose = true;
+        // ssl is defaulted in lib/installer.php
 
         foreach ($options as $option) {
             $arg = $option[0];
@@ -157,6 +162,8 @@ install_cli.php - StatusNet command-line installer
     -p --path=<path>     Use <path> as path name
        --sitename        User-friendly site name (required)
        --fancy           Whether to use fancy URLs (default no)
+       --ssl             Server SSL enabled (default never), 
+                         [never | sometimes | always]
 
        --dbtype          'mysql' (default) or 'pgsql'
        --host            Database hostname (required)
@@ -170,6 +177,8 @@ install_cli.php - StatusNet command-line installer
        --admin-updates   'yes' (default) or 'no', whether to subscribe
                          admin to update@status.net (default yes)
        
+       --site-profile    site profile ['public', 'private' (default), 'community', 'singleuser']
+       
        --skip-config     Don't write a config.php -- use with caution,
                          requires a global configuration file.
 
@@ -208,7 +217,7 @@ END_HELP;
         $breakout = preg_replace('/<a[^>+]\bhref="(.*)"[^>]*>(.*)<\/a>/',
                                  '\2 &lt;\1&gt;',
                                  $html);
-        return html_entity_decode(strip_tags($breakout));
+        return html_entity_decode(strip_tags($breakout), ENT_QUOTES, 'UTF-8');
     }
 }