GitHost.io will be shut down on June 1, 2019. At that point this instance will be unreachable and all data will be irrevocably deleted. More details at https://about.gitlab.com/gitlab-hosted/#githost-is-shutting-down-on-june-1st-2019

Commit fb82c75b authored by mmn's avatar mmn

adminUpdates setting not available now

We don't run a service similar to update.status.net yet. Maybe we should,
but that's for the future to decide. Currently I view it as a callback
that we want to avoid.
parent 1207f4f0
......@@ -257,11 +257,6 @@ class WebInstaller extends Installer
<input id="admin_email" name="admin_email" value="{$post->value('admin_email')}" />
<p class="form_guide">Optional email address for the initial user (administrator)</p>
</li>
<li>
<label for="admin_updates">Subscribe to announcements</label>
<input type="checkbox" id="admin_updates" name="admin_updates" value="true" checked="checked" />
<p class="form_guide">Release and security feed from <a href="http://update.status.net/">update@status.net</a> (recommended)</p>
</li>
</ul>
</fieldset>
<fieldset id="settings_profile">
......@@ -333,7 +328,6 @@ STR;
$this->adminPass = $post->string('admin_password');
$adminPass2 = $post->string('admin_password2');
$this->adminEmail = $post->string('admin_email');
$this->adminUpdates = $post->string('admin_updates');
$this->siteProfile = $post->string('site_profile');
......
......@@ -47,7 +47,7 @@ abstract class Installer
/** DB info */
public $host, $database, $dbtype, $username, $password, $db;
/** Administrator info */
public $adminNick, $adminPass, $adminEmail, $adminUpdates;
public $adminNick, $adminPass, $adminEmail;
/** Should we skip writing the configuration file? */
public $skipConfig = false;
......@@ -520,19 +520,6 @@ abstract class Installer
$user->grantRole('moderator');
$user->grantRole('administrator');
// Attempt to do a remote subscribe to update@status.net
// Will fail if instance is on a private network.
if ($this->adminUpdates && class_exists('Ostatus_profile')) {
try {
$oprofile = Ostatus_profile::ensureProfileURL('http://update.status.net/');
Subscription::start($user->getProfile(), $oprofile->localProfile());
$this->updateStatus("Set up subscription to <a href='http://update.status.net/'>update@status.net</a>.");
} catch (Exception $e) {
$this->updateStatus("Could not set up subscription to <a href='http://update.status.net/'>update@status.net</a>.", true);
}
}
return true;
}
......
......@@ -133,7 +133,6 @@ class DomainStatusNetworkInstaller extends Installer
$this->adminNick = null;
$this->adminPass = null;
$this->adminEmail = null;
$this->adminUpdates = null;
/** Should we skip writing the configuration file? */
$this->skipConfig = true;
......
......@@ -84,7 +84,6 @@ class CliInstaller extends Installer
'--admin-nick' => 'adminNick',
'--admin-pass' => 'adminPass',
'--admin-email' => 'adminEmail',
'--admin-updates' => 'adminUpdates',
'--site-profile' => 'siteProfile'
);
......@@ -106,7 +105,6 @@ class CliInstaller extends Installer
// defaults
$this->dbtype = 'mysql';
$this->adminUpdates = true;
$this->verbose = true;
// ssl is defaulted in lib/installer.php
......@@ -115,7 +113,7 @@ class CliInstaller extends Installer
if (isset($map[$arg])) {
$var = $map[$arg];
$this->$var = $option[1];
if ($var == 'adminUpdates' || $arg == '--fancy') {
if ($arg == '--fancy') {
$this->$var = ($option[1] != 'false') && ($option[1] != 'no');
}
} else if ($arg == '--skip-config') {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment