Do not hardcode the php username dummy in Icinga\Application\Platform

refs #7163
Icinga · Nov 7, 2014 · f85ddeb · f85ddeb
1 parent eadc7d8
commit f85ddeb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/application/views/scripts/form/setup-welcome.phtml b/application/views/scripts/form/setup-welcome.phtml
@@ -65,13 +65,13 @@ $setupTokenPath = rtrim(Icinga::app()->getConfigDir(), '/') . '/setup.token';
       ); ?></p>
       <p><?= t('If you\'ve got the IcingaCLI installed you can do the following:'); ?></p>
       <div class="code">
-        <span>sudo icingacli setup createConfigDirectory <?= Platform::getPhpUser(); ?>;</span>
+        <span>sudo icingacli setup createConfigDirectory <?= ($user = Platform::getPhpUser()) !== null ? $user : 'your_webserver_group'; ?>;</span>
         <span>sudo icingacli setup generateToken;</span>
       </div>
       <p><?= t('In case the IcingaCLI is missing you can create the token manually:'); ?></p>
       <div class="code">
-        <span>sudo mkdir -m 2775 <?= dirname($setupTokenPath); ?> && sudo chgrp <?= Platform::getPhpUser(); ?> <?= dirname($setupTokenPath); ?>;</span>
-        <span>head -c 12 /dev/urandom | base64 | sudo -u '<?= Platform::getPhpUser(); ?>' tee <?= $setupTokenPath; ?>;</span>
+        <span>sudo mkdir -m 2775 <?= dirname($setupTokenPath); ?> && sudo chgrp <?= ($user = Platform::getPhpUser()) !== null ? $user : 'your_webserver_group'; ?> <?= dirname($setupTokenPath); ?>;</span>
+        <span>head -c 12 /dev/urandom | base64 | sudo -u '<?= ($user = Platform::getPhpUser()) !== null ? $user : 'your_webserver_group'; ?>' tee <?= $setupTokenPath; ?>;</span>
         <span>sudo chmod 0660 <?= $setupTokenPath; ?>;</span>
       </div>
       <p style="font-size: 85%;"><?= sprintf(

diff --git a/library/Icinga/Application/Platform.php b/library/Icinga/Application/Platform.php
@@ -156,8 +156,6 @@ public static function getPhpUser()
             $userInfo = posix_getpwuid(posix_geteuid());
             return $userInfo['name'];
         }
-
-        return 'php_username';
     }
 
     /**