Skip to content

Commit

Permalink
Merge pull request #748 from stefanorosanelli/refactor/app-config
Browse files Browse the repository at this point in the history
Introduce `app_local.php` conf
  • Loading branch information
stefanorosanelli authored Jun 28, 2022
2 parents b06f209 + 068b6b0 commit 75c61b1
Show file tree
Hide file tree
Showing 13 changed files with 879 additions and 1,139 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/.vagrant/*
/composer.lock
/composer.local.json
/config/app.php
/config/app_local.php
/config/.env
/config/projects/*
/coverage/*
Expand Down
6 changes: 6 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,12 @@ And then point your browser to `http://localhost:8765/`

For any other use than a simple test we recommend to configure your preferred web server like Nginx/Apache and point to `webroot/` as vhost document root.

## Configuration

You can further configure your BEdita Manager instance in `config/app_local.php` with environment and project specific settings.

Have look at the main [Manager configuration wiki page](https://github.com/bedita/manager/wiki/Manager-App-Configuration) on how to customize your Manager instance.

## Docker

### Pull official image
Expand Down
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"dereuromark/cakephp-ide-helper": "~1.17.0",
"phpstan/phpstan": "^1.5",
"phpunit/phpunit": "^9",
"psy/psysh": "@stable"
"cakephp/repl": "^0.1"
},
"autoload": {
"psr-4": {
Expand All @@ -61,7 +61,7 @@
"@test",
"@cs-check"
],
"analyse": "vendor/bin/phpstan analyse",
"stan": "vendor/bin/phpstan analyse",
"cs-check": "vendor/bin/phpcs --extensions=php --colors -p ./src ./tests ./config",
"cs-fix": "vendor/bin/phpcbf --extensions=php --colors ./src ./tests ./config",
"test": "vendor/bin/phpunit --colors=always",
Expand Down
3 changes: 3 additions & 0 deletions config/.env.example
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ export APP_DEFAULT_LOCALE="en_US"
export BEDITA_API="https://bedita-api-url"
export BEDITA_API_KEY="bedita-api-key"

# Uncomment this line and set a random string to define the security salt as environment variable.
# export SECURITY_SALT="#######"

# Uncomment these to define cache configuration via environment variables.
#export CACHE_DURATION="+2 minutes"
#export CACHE_DEFAULT_URL="file://tmp/cache/?prefix=${APP_NAME}_default&duration=${CACHE_DURATION}"
Expand Down
Loading

0 comments on commit 75c61b1

Please sign in to comment.