holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

try fixing Travis install of multiple dbs

Browse Source
This commit is contained in:
Ralf Becker 2016-08-07 10:38:43 +02:00
parent 427620e9c4
commit 8a60c2bc23
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.travis.yml
View File

@ -62,6 +62,7 @@ before_script:
# create data directory # create data directory
- sudo mkdir /var/lib/egroupware - sudo mkdir /var/lib/egroupware
- sudo chown travis /var/lib/egroupware - sudo chown travis /var/lib/egroupware
- ln -s /var/lib/egroupware/header.inc.php
script: script:
# install egroupware using MariaDB as domain "default" # install egroupware using MariaDB as domain "default"

7
doc/rpm-build/post_install.php
View File

@ -1,4 +1,4 @@
#!/usr/bin/php #!/usr/bin/env php
<?php <?php
/** /**
* EGroupware - RPM post install: automatic install or update EGroupware * EGroupware - RPM post install: automatic install or update EGroupware
@ -16,7 +16,7 @@ if (php_sapi_name() !== 'cli') // security precaution: forbit calling post_insta
$verbose = false; $verbose = false;
$config = array( $config = array(
'php' => PHP_BINARY, 'php' => PHP_BINARY,
'source_dir' => '/usr/share/egroupware', 'source_dir' => realpath(__DIR__.'/../..'),
'data_dir' => '/var/lib/egroupware', 'data_dir' => '/var/lib/egroupware',
'header' => '$data_dir/header.inc.php', // symlinked to source_dir by rpm 'header' => '$data_dir/header.inc.php', // symlinked to source_dir by rpm
'setup-cli' => '$source_dir/setup/setup-cli.php', 'setup-cli' => '$source_dir/setup/setup-cli.php',
@ -404,7 +404,8 @@ if (!isset($GLOBALS['egw_domain']) || $config['domain'] !== 'default' && !isset
if (empty($config['db_root_pw'])) if (empty($config['db_root_pw']))
{ {
echo "*** Database has no root password set, please fix that immediatly: mysqladmin -u root password NEWPASSWORD\n\n"; echo "*** Database has no root password set, please fix that immediatly".
(substr($config['db_type'], 0, 5) === 'mysql' ? ": mysqladmin -u root password NEWPASSWORD\n\n" : "!\n\n");
} }
} }
else else