"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "modules/setup/application/views/scripts/form/setup-welcome.phtml" between
icingaweb2-2.11.3.tar.gz and icingaweb2-2.11.4.tar.gz

About: Icinga Web 2 is an Web interface for Icinga 2, a network and computer system monitoring system.

setup-welcome.phtml  (icingaweb2-2.11.3)	:	setup-welcome.phtml  (icingaweb2-2.11.4)
skipping to change at line 14		skipping to change at line 14
use Icinga\Application\Config;		use Icinga\Application\Config;
use Icinga\Application\Platform;		use Icinga\Application\Platform;
use Icinga\Web\Wizard;		use Icinga\Web\Wizard;
$phpUser = Platform::getPhpUser();		$phpUser = Platform::getPhpUser();
$configDir = Icinga::app()->getConfigDir();		$configDir = Icinga::app()->getConfigDir();
$setupTokenPath = rtrim($configDir, '/') . '/setup.token';		$setupTokenPath = rtrim($configDir, '/') . '/setup.token';
$cliPath = realpath(Icinga::app()->getApplicationDir() . '/../bin/icingacli');		$cliPath = realpath(Icinga::app()->getApplicationDir() . '/../bin/icingacli');
$groupadd = null;		$groupadd = null;
		$docker = getenv('ICINGAWEB_OFFICIAL_DOCKER_IMAGE');
if (! (false === ($distro = Platform::getLinuxDistro(1)) || $distro === 'linux') ) {		if (! (false === ($distro = Platform::getLinuxDistro(1)) || $distro === 'linux') ) {
foreach (array(		foreach (array(
'groupadd -r icingaweb2' => array(		'groupadd -r icingaweb2' => array(
'redhat', 'rhel', 'centos', 'fedora',		'redhat', 'rhel', 'centos', 'fedora',
'suse', 'sles', 'sled', 'opensuse'		'suse', 'sles', 'sled', 'opensuse'
),		),
'addgroup --system icingaweb2' => array('debian', 'ubuntu')		'addgroup --system icingaweb2' => array('debian', 'ubuntu')
) as $groupadd_ => $distros) {		) as $groupadd_ => $distros) {
if (in_array($distro, $distros)) {		if (in_array($distro, $distros)) {
$groupadd = $groupadd_;		$groupadd = $groupadd_;
skipping to change at line 82		skipping to change at line 84
</div>		</div>
</form>		</form>
<div class="note">		<div class="note">
<h3><?= $this->translate('Generating a New Setup Token'); ?></h3>		<h3><?= $this->translate('Generating a New Setup Token'); ?></h3>
<div>		<div>
<p><?=		<p><?=
$this->translate(		$this->translate(
'To run this wizard a user needs to authenticate using a token which i s usually'		'To run this wizard a user needs to authenticate using a token which i s usually'
. ' provided to him by an administrator who\'d followed the instructio ns below.'		. ' provided to him by an administrator who\'d followed the instructio ns below.'
); ?></p>		); ?></p>
		<?php if (! $docker): ?>
<p><?= $this->translate('In any case, make sure that all of the following applies to your environment:'); ?></p>		<p><?= $this->translate('In any case, make sure that all of the following applies to your environment:'); ?></p>
<ul>		<ul>
<li><?= $this->translate('A system group called "icingaweb2" exists'); ? ></li>		<li><?= $this->translate('A system group called "icingaweb2" exists'); ? ></li>
<?php if ($phpUser): ?>		<?php if ($phpUser): ?>
<li><?= sprintf($this->translate('The user "%s" is a member of the syste m group "icingaweb2"'), $phpUser); ?></li>		<li><?= sprintf($this->translate('The user "%s" is a member of the syste m group "icingaweb2"'), $phpUser); ?></li>
<?php else: ?>		<?php else: ?>
<li><?= $this->translate('Your webserver\'s user is a member of the syst em group "icingaweb2"'); ?></li>		<li><?= $this->translate('Your webserver\'s user is a member of the syst em group "icingaweb2"'); ?></li>
<?php endif ?>		<?php endif ?>
</ul>		</ul>
<?php if (! ($groupadd === null || $usermod === null)) { ?>		<?php if (! ($groupadd === null || $usermod === null)) { ?>
<div class="code">		<div class="code">
<span><?= $this->escape($groupadd . ';') ?></span>		<span><?= $this->escape($groupadd . ';') ?></span>
<span><?= $this->escape(sprintf($usermod, $phpUser ?: $webSrvUser) . ';' ) ?></span>		<span><?= $this->escape(sprintf($usermod, $phpUser ?: $webSrvUser) . ';' ) ?></span>
</div>		</div>
<?php } ?>		<?php } ?>
<p><?= $this->translate('If you\'ve got the IcingaCLI installed you can do the following:'); ?></p>		<p><?= $this->translate('If you\'ve got the IcingaCLI installed you can do the following:'); ?></p>
		<?php endif; ?>
<div class="code">		<div class="code">
		<?php if (! $docker): ?>
<span><?= $cliPath ? $cliPath : 'icingacli'; ?> setup config directory - -group icingaweb2<?= $configDir !== '/etc/icingaweb2' ? ' --config ' . $configDi r : ''; ?>;</span>		<span><?= $cliPath ? $cliPath : 'icingacli'; ?> setup config directory - -group icingaweb2<?= $configDir !== '/etc/icingaweb2' ? ' --config ' . $configDi r : ''; ?>;</span>
		<?php endif; ?>
<span><?= $cliPath ? $cliPath : 'icingacli'; ?> setup token create;</spa n>		<span><?= $cliPath ? $cliPath : 'icingacli'; ?> setup token create;</spa n>
</div>		</div>
		<?php if (! $docker): ?>
<p><?= $this->translate('In case the IcingaCLI is missing you can create t he token manually:'); ?></p>		<p><?= $this->translate('In case the IcingaCLI is missing you can create t he token manually:'); ?></p>
<div class="code">		<div class="code">
<span>su <?= $phpUser ?: $this->translate('<your-webserver-user>'); ?> - s /bin/sh -c "mkdir -m 2770 <?= dirname($setupTokenPath); ?>; chgrp icingaweb2 < ?= dirname($setupTokenPath); ?>; head -c 12 /dev/urandom | base64 | tee <?= $set upTokenPath; ?>; chmod 0660 <?= $setupTokenPath; ?>;";</span>		<span>su <?= $phpUser ?: $this->translate('<your-webserver-user>'); ?> - s /bin/sh -c "mkdir -m 2770 <?= dirname($setupTokenPath); ?>; chgrp icingaweb2 < ?= dirname($setupTokenPath); ?>; head -c 12 /dev/urandom | base64 | tee <?= $set upTokenPath; ?>; chmod 0660 <?= $setupTokenPath; ?>;";</span>
</div>		</div>
		<?php endif; ?>
<p><?= sprintf(		<p><?= sprintf(
$this->translate('Please see the %s for an extensive description on how to access and use this wizard.'),		$this->translate('Please see the %s for an extensive description on how to access and use this wizard.'),
'<a href="http://docs.icinga.com/">' . $this->translate('Icinga Web 2 do cumentation') . '</a>' // TODO: Add link to iw2 docs which points to the install ation topic		'<a href="http://docs.icinga.com/">' . $this->translate('Icinga Web 2 do cumentation') . '</a>' // TODO: Add link to iw2 docs which points to the install ation topic
); ?></p>		); ?></p>
</div>		</div>
</div>		</div>
</div>		</div>
End of changes. 7 change blocks.
0 lines changed or deleted		8 lines changed or added

---