hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-07 10:04:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix all outdated references to environment.*.js. Fix bug in Docker compose too

Browse Source
This commit is contained in:
Tim Donohue
2020-05-29 16:52:54 -05:00
parent acd6e6079e
commit 23e8c8b449
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docker/README.md
View File

@@ -11,7 +11,7 @@
- Docker compose file that provides a DSpace CLI container to work with a running DSpace REST container. - Docker compose file that provides a DSpace CLI container to work with a running DSpace REST container.
- cli.assetstore.yml - cli.assetstore.yml
- Docker compose file that will download and install data into a DSpace REST assetstore. This script points to a default dataset that will be utilized for CI testing. - Docker compose file that will download and install data into a DSpace REST assetstore. This script points to a default dataset that will be utilized for CI testing.
- environment.dev.js - environment.dev.ts
- Environment file for running DSpace Angular in Docker - Environment file for running DSpace Angular in Docker
- local.cfg - local.cfg
- Environment file for running the DSpace 7 REST API in Docker. - Environment file for running the DSpace 7 REST API in Docker.

2
docker/docker-compose.yml
View File

@@ -23,4 +23,4 @@ services:
stdin_open: true stdin_open: true
tty: true tty: true
volumes: volumes:
- ./environment.dev.js:/app/src/environments/environment.dev.ts - ./environment.dev.ts:/app/src/environments/environment.dev.ts

22
docs/Configuration.md
View File

@@ -1,9 +1,9 @@
# Configuration # Configuration
Default configuration file is located in `config/` folder. All configuration options should be listed in the default configuration file `config/environment.default.js`. Please do not change this file directly! To change the default configuration values, create local files that override the parameters you need to change: Default configuration file is located in `src/environments/` folder. All configuration options should be listed in the default configuration file `src/environments/environment.common.ts`. Please do not change this file directly! To change the default configuration values, create local files that override the parameters you need to change. You can use `environment.template.ts` as a starting point.
- Create a new `environment.dev.js` file in `config/` for `devel` environment; - Create a new `environment.dev.ts` file in `src/environments/` for `development` environment;
- Create a new `environment.prod.js` file in `config/` for `production` environment; - Create a new `environment.prod.ts` file in `src/environments/` for `production` environment;
Some few configuration options can be overridden by setting environment variables. These and the variable names are listed below. Some few configuration options can be overridden by setting environment variables. These and the variable names are listed below.
@@ -12,8 +12,8 @@ When you start dspace-angular on node, it spins up an http server on which it li
To change this configuration, change the options `ui.host`, `ui.port` and `ui.ssl` in the appropriate configuration file (see above): To change this configuration, change the options `ui.host`, `ui.port` and `ui.ssl` in the appropriate configuration file (see above):
``` ```
module.exports = { export const environment = {
// Angular Universal server settings. // Angular UI settings.
ui: { ui: {
ssl: false, ssl: false,
host: 'localhost', host: 'localhost',
@@ -35,14 +35,14 @@ Alternately you can set the following environment variables. If any of these are
dspace-angular connects to your DSpace installation by using its REST endpoint. To do so, you have to define the ip address, port and if ssl should be enabled. You can do this in a configuration file (see above) by adding the following options: dspace-angular connects to your DSpace installation by using its REST endpoint. To do so, you have to define the ip address, port and if ssl should be enabled. You can do this in a configuration file (see above) by adding the following options:
``` ```
module.exports = { export const environment = {
// The REST API server settings. // The REST API server settings.
rest: { rest: {
ssl: true, ssl: true,
host: 'dspace7.4science.it', host: 'dspace7.4science.cloud',
port: 443, port: 443,
// NOTE: Space is capitalized because 'namespace' is a reserved string in TypeScript // NOTE: Space is capitalized because 'namespace' is a reserved string in TypeScript
nameSpace: '/dspace-spring-rest/api' nameSpace: '/server/api'
} }
}; };
``` ```
@@ -50,9 +50,9 @@ module.exports = {
Alternately you can set the following environment variables. If any of these are set, it will override all configuration files: Alternately you can set the following environment variables. If any of these are set, it will override all configuration files:
``` ```
DSPACE_REST_SSL=true DSPACE_REST_SSL=true
DSPACE_REST_HOST=localhost DSPACE_REST_HOST=dspace7.4science.cloud
DSPACE_REST_PORT=4000 DSPACE_REST_PORT=443
DSPACE_REST_NAMESPACE=/ DSPACE_REST_NAMESPACE=/server/api
``` ```
## Supporting analytics services other than Google Analytics ## Supporting analytics services other than Google Analytics