Skip to content

Commit

Permalink
Merge pull request #203 from cytopia/new-php-container
Browse files Browse the repository at this point in the history 
REL-0.13: New PHP Container
  • Loading branch information
@cytopia
cytopia authored Apr 15, 2018
2 parents abb7b8d + 068545a commit 9604180
Show file tree
Hide file tree
Showing 6,689 changed files with 229,949 additions and 507,701 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
4 changes: 2 additions & 2 deletions .devilbox/www/config.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
putenv('RES_OPTIONS=retrans:1 retry:1 timeout:1 attempts:1');


$DEVILBOX_VERSION = 'v0.12.1';
$DEVILBOX_DATE = '2018-01-30';
$DEVILBOX_VERSION = 'v0.13';
$DEVILBOX_DATE = '2018-04-14';
$DEVILBOX_API_PAGE = 'devilbox-api/status.json';

//
Expand Down
2 changes: 1 addition & 1 deletion .devilbox/www/htdocs/credits.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

<div class="col-md-6">
<h2>Contributors</h2>
<p>The following people have contributed to the <a href="https://github.com/cytopia/devilbox">Devilbox</a>.</p>
<p>The following people have contributed to the <a href="https://github.com/cytopia/devilbox/graphs/contributors">Devilbox</a>.</p>
<table class="table table-striped ">
<thead class="thead-inverse ">
<tr>
Expand Down
45 changes: 8 additions & 37 deletions .devilbox/www/htdocs/index.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -372,40 +372,6 @@
<th>Postfix</th>
<td><?php echo loadClass('Helper')->getEnv('ENABLE_MAIL') ? 'Enabled' : '<span class="bg-danger">No</span> Disabled';?></td>
</tr>
<tr>
<th>Xdebug</th>
<td>
<?php $Xdebug = (loadClass('Helper')->getEnv('PHP_XDEBUG_ENABLE') == 0) ? '' : loadClass('Helper')->getEnv('PHP_XDEBUG_ENABLE'); ?>
<?php if ($Xdebug == loadClass('Php')->getConfig('xdebug.remote_enable')): ?>
<?php echo loadClass('Php')->getConfig('xdebug.remote_enable') == 1 ? 'Yes' : 'No'; ?>
<?php else: ?>
<?php echo '<span class="text-danger">not installed</span>.env file setting differs from custom php .ini file</span><br/>'; ?>
<?php echo 'Effective setting: '.loadClass('Php')->getConfig('xdebug.remote_enable'); ?>
<?php endif; ?>
</td>
</tr>
<tr>
<th>Xdebug Remote</th>
<td>
<?php if (loadClass('Helper')->getEnv('PHP_XDEBUG_REMOTE_HOST') == loadClass('Php')->getConfig('xdebug.remote_host')): ?>
<?php echo loadClass('Php')->getConfig('xdebug.remote_host'); ?>
<?php else: ?>
<?php echo '<span class="text-danger">not installed</span>.env file setting differs from custom php .ini file</span><br/>'; ?>
<?php echo 'Effective setting: '.loadClass('Php')->getConfig('xdebug.remote_host'); ?>
<?php endif; ?>
</td>
</tr>
<tr>
<th>Xdebug Port</th>
<td>
<?php if (loadClass('Helper')->getEnv('PHP_XDEBUG_REMOTE_PORT') == loadClass('Php')->getConfig('xdebug.remote_port')): ?>
<?php echo loadClass('Php')->getConfig('xdebug.remote_port'); ?>
<?php else: ?>
<?php echo '<span class="text-danger">not installed</span>.env file setting differs from custom php .ini file</span><br/>'; ?>
<?php echo 'Effective setting: '.loadClass('Php')->getConfig('xdebug.remote_port'); ?>
<?php endif; ?>
</td>
</tr>
</tbody>
</table>

Expand Down Expand Up @@ -765,10 +731,15 @@
</thead>
<tbody>
<tr>
<th>php</th>
<td>./cfg/<?php echo loadClass('Helper')->getEnv('PHP_SERVER'); ?></td>
<th>php (ini)</th>
<td>./cfg/php-ini-<?php echo loadClass('Helper')->getEnv('PHP_SERVER'); ?></td>
<td>/etc/php-custom.d</td>
</tr>
<tr>
<th>php (fpm)</th>
<td>./cfg/php-fpm-<?php echo loadClass('Helper')->getEnv('PHP_SERVER'); ?></td>
<td>/etc/php-fpm-custom.d</td>
</tr>
<tr>
<th>httpd</th>
<td>./cfg/<?php echo loadClass('Helper')->getEnv('HTTPD_SERVER'); ?></td>
Expand Down Expand Up @@ -841,7 +812,7 @@
<tbody>
<tr>
<th>php</th>
<td>./log/<?php echo loadClass('Helper')->getEnv('PHP_SERVER'); ?></td>
<td>./log/php-fpm-<?php echo loadClass('Helper')->getEnv('PHP_SERVER'); ?></td>
<td>/var/log/php</td>
</tr>
<tr>
Expand Down
1,831 changes: 0 additions & 1,831 deletions .devilbox/www/htdocs/vendor/adminer-4.3.1-en.php
View file

This file was deleted.

1,942 changes: 1,942 additions & 0 deletions .devilbox/www/htdocs/vendor/adminer-4.6.2-en.php
View file

Large diffs are not rendered by default.

35 changes: 0 additions & 35 deletions .devilbox/www/htdocs/vendor/phpmyadmin-4.7/CONTRIBUTING.md
View file

This file was deleted.

166 changes: 0 additions & 166 deletions .devilbox/www/htdocs/vendor/phpmyadmin-4.7/ChangeLog
View file

This file was deleted.

52 changes: 0 additions & 52 deletions .devilbox/www/htdocs/vendor/phpmyadmin-4.7/README
View file

This file was deleted.

1 change: 0 additions & 1 deletion .devilbox/www/htdocs/vendor/phpmyadmin-4.7/RELEASE-DATE-4.7.0
View file

This file was deleted.

Loading

0 comments on commit 9604180

Please sign in to comment.