Skip to content
Snippets Groups Projects
Commit 046b20a4 authored by Sebastian Kehr's avatar Sebastian Kehr :rowboat_tone2: Committed by Frank Morgner
Browse files

refs #14831 [fid] [supplement] - adjusts configuration of fid instance branch

* renames base configuration folder to «fid»
* uses valid api backend
* loads finc module + require explicit version of core module including registration feature
parent 0b4ce76b
Branches
Tags
No related merge requests found
This diff is collapsed.
......@@ -24,16 +24,14 @@ if ($localModules = getenv('VUFIND_LOCAL_MODULES')) {
/** Begin of temporarily necessary adjustments. */
shell_exec('php devops/composer/themes.php');
// Drop finc module.
$modules = array_diff($modules, ['finc']);
// Append custom modules.
array_push($modules, ...[
'Zend\Validator',
'Zend\Serializer',
'finc',
'finc\VuFindHttpPsrCompat',
'finc\SymfonySerializerZendBridge',
'finc\Fid\Core',
'finc\Fid\Registration',
]);
/** End of temporarily necessary adjustments. */
......
......@@ -4,8 +4,9 @@ services:
php:
<<: &volumes
volumes:
# - ./host/path/to/your/package:/usr/local/vufind/vendor/your-vendor/your-package
# - ./host/path/to/your/theme/:/usr/local/vufind/themes/your-theme
# - path/to/core-module:/usr/local/vufind/vendor/finc/fid-core-module
# - path/to/core-module/res/mixins/core:/usr/local/vufind/themes/finc-fid-core
# - path/to/core-module/res/mixins/registration:/usr/local/vufind/themes/finc-fid-registration
httpd:
<<: *volumes
grunt:
......
......@@ -18,7 +18,7 @@ services:
volumes:
- ./:/usr/local/vufind
environment:
VUFIND_LOCAL_DIR: /usr/local/vufind/finc-fid/dev
VUFIND_LOCAL_DIR: /usr/local/vufind/fid/dev
VUFIND_CACHE_DIR: /usr/local/vufind/data/cache
VUFIND_ENV: development
PHP_IDE_CONFIG: serverName=finc-fid-frontend
......@@ -76,7 +76,7 @@ services:
volumes:
- ./:/usr/local/vufind:z
environment:
VUFIND_SITE: finc-fid
VUFIND_SITE: fid
VUFIND_INSTANCE: dev
VUFIND_DB_CLIENT: "%"
VUFIND_DB_ADMIN_PASSWORD: adminpw
......
File moved
File moved
[Client]
baseUrl = http://172.18.113.133/fid-7101bb5
\ No newline at end of file
File moved
File moved
[Client]
baseUrl = http://172.18.113.133/fid-92a9e94c
\ No newline at end of file
......@@ -20,6 +20,9 @@
*/
return [
'extends' => 'finc-fid-core',
'mixins' => ['finc-fid-registration'],
'extends' => 'finc',
'mixins' => [
'finc-fid-core',
'finc-fid-registration'
],
];
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment