Skip to content

Commit 5c1baaf

Browse files
committed
Restore failed rebase
1 parent cdca62a commit 5c1baaf

File tree

26 files changed

+119
-423
lines changed

26 files changed

+119
-423
lines changed

.devilbox/etc/mariadb-10.2/.keepme

Whitespace-only changes.

.devilbox/etc/mariadb-10.3/.keepme

Whitespace-only changes.

.devilbox/etc/mariadb-5.5/.keepme

Whitespace-only changes.

.devilbox/etc/mysql-5.5/.keepme

Whitespace-only changes.

.devilbox/etc/mysql-5.6/.keepme

Whitespace-only changes.

.devilbox/etc/mysql-5.7/.keepme

Whitespace-only changes.

.devilbox/etc/mysql-8.0/.keepme

Whitespace-only changes.

.devilbox/etc/mysql-8.0/charset.cnf

Lines changed: 0 additions & 10 deletions
This file was deleted.

.devilbox/www/config.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
putenv('RES_OPTIONS=retrans:1 retry:1 timeout:1 attempts:1');
1414

1515

16-
$DEVILBOX_VERSION = 'v0.15';
16+
$DEVILBOX_VERSION = 'v1.0.0-alpha1';
1717
$DEVILBOX_DATE = '2019-03-09';
1818
$DEVILBOX_API_PAGE = 'devilbox-api/status.json';
1919

.devilbox/www/htdocs/index.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -679,14 +679,14 @@
679679
<?php if ($avail_mysql): ?>
680680
<tr>
681681
<th>mysql</th>
682-
<td><?php echo loadClass('Helper')->getEnv('HOST_PATH_MYSQL_DATADIR').'/'.loadClass('Helper')->getEnv('MYSQL_SERVER'); ?></td>
682+
<td>Docker volume</td>
683683
<td>/var/lib/mysql</td>
684684
</tr>
685685
<?php endif; ?>
686686
<?php if ($avail_pgsql): ?>
687687
<tr>
688688
<th>pgsql</th>
689-
<td><?php echo loadClass('Helper')->getEnv('HOST_PATH_PGSQL_DATADIR').'/'.loadClass('Helper')->getEnv('PGSQL_SERVER'); ?></td>
689+
<td>Docker volume</td>
690690
<td>/var/lib/postgresql/data/pgdata</td>
691691
</tr>
692692
<?php endif; ?>
@@ -707,7 +707,7 @@
707707
<?php if ($avail_mongo): ?>
708708
<tr>
709709
<th>mongo</th>
710-
<td><?php echo loadClass('Helper')->getEnv('HOST_PATH_MONGO_DATADIR'); ?></td>
710+
<td>Docker volume</td>
711711
<td>/data/db</td>
712712
</tr>
713713
<?php endif; ?>

0 commit comments

Comments
 (0)