Skip to content
Permalink
Browse files

Fix env syntax error for mac and update install options

  • Loading branch information
Maffooch Maffooch
Maffooch authored and Maffooch committed Nov 8, 2019
1 parent a0e0832 commit f3579b1aab24dbf03a3f4ba1e3e5e409b0d33939
Showing with 17 additions and 113 deletions.
  1. +2 −2 DOCKER.md
  2. +4 −4 README.md
  3. +9 −1 docker/setEnv.sh
  4. +0 −102 setup.bash
  5. +2 −4 setup/README.MD
@@ -2,7 +2,7 @@

Docker compose is not intended for production use.
If you want to deploy a containerized DefectDojo to a production environment,
use the [Helm and Kubernetes](KUBERNETES.md) approach.
use the [Default installation](setup/README.md) approach.

## Prerequisites
* Docker version
@@ -118,7 +118,7 @@ or:
docker logs django-defectdojo_initializer_1
```

Beware that when re-running the application several times, there may be several occurrences of "Admin password". In that case you should use the last occurrence.
Make sure you write down the first password generated as you'll need it when re-starting the application.

### Disable the database initialization
The initializer container can be disabled by exporting: `export DD_INITIALIZE=false`.
@@ -40,9 +40,9 @@ Navigate to <http://localhost:8080>.
For detailed documentation you can visit
[Read the Docs](https://defectdojo.readthedocs.io/).

## Installation Options
## Supported Installation Options

* [Kubernetes](KUBERNETES.md)
* [Setup.bash](setup/README.md)
* [Docker](DOCKER.md)

## Getting Started
@@ -73,6 +73,8 @@ Realtime discussion is done in the OWASP Slack Channel, #defectdojo.

![Twitter](https://raw.githubusercontent.com/DefectDojo/Documentation/master/doc/img/Twitter_Logo.png)

More info: [Contributing guideline](CONTRIBUTING.md)

[DefectDojo Twitter Account](https://twitter.com/defectdojo) tweets project
updates and changes.

@@ -136,12 +138,10 @@ Proceeds are used for testing, infrastructure, etc.
[![Xing](https://raw.githubusercontent.com/DefectDojo/Documentation/master/doc/img/XING_logo.png)](https://corporate.xing.com/en/about-xing/security/)
[![10Security](https://raw.githubusercontent.com/DefectDojo/Documentation/master/doc/img/10Security-logo.png)](https://10security.com/services-by-technology/defectdojo-commercial-support/)
[![GCSecurity](https://raw.githubusercontent.com/DefectDojo/Documentation/master/doc/img/gc_logo_2018.png)](https://gcsec.com.br/)
[![ISAAC](https://raw.githubusercontent.com/DefectDojo/Documentation/master/doc/img/isaac.png)](https://isaac.nl "ISAAC")
[![Timo-Pagel](https://raw.githubusercontent.com/DefectDojo/Documentation/master/doc/img/timo-pagel-logo.png )](https://pagel.pro/)
[![SDA-SE](https://raw.githubusercontent.com/DefectDojo/Documentation/master/doc/img/sda-se-logo.png)](https://sda-se.com/)
[![Signal-Iduna](https://raw.githubusercontent.com/DefectDojo/Documentation/master/doc/img/signal-iduna.png)](https://signal-iduna.de/)


Interested in becoming a sponsor and having your logo displayed? Please review
our [sponsorship information](SPONSORING.md) or email greg.anderson@owasp.org

@@ -20,7 +20,15 @@ function show_current {
function get_current {
if [ -L ${override_link} ]
then
current_env=$(expr $(basename $(readlink -f docker-compose.override.yml)) : "^docker-compose.override.\(.*\).yml$")
# Check for Mac OSX
if [[ "$OSTYPE" == "darwin"* ]]; then
# readlink is not native to mac, so this will work in it's place.
symlink=$(python3 -c "import os; print(os.path.realpath('docker-compose.override.yml'))")
else
# Maintain the cleaner way
symlink=$(readlink -f docker-compose.override.yml)
fi
current_env=$(expr $(basename symlink) : "^docker-compose.override.\(.*\).yml$")
else
current_env=release
fi

This file was deleted.

@@ -27,7 +27,7 @@ All installs make these assumption:
* * Running setup.bash without editing template-env assumes a single-server install.
* * Running setup.bash without editing template-env non-interactively assumes a single-server install with MySQL
* Any install configuration variable can be overridden by setting an environmental variable
* One of the following OSes is used as the base for the install
* One of the following Operating Systems is used as the base for the install
* * Ubuntu Linux - officially supported versions: 16.04 LTS, 18.04 LTS
* * CentOS - officially supported versions: ?
* * Mac OS X - officially supported versions: ?
@@ -66,7 +66,7 @@ setup.bash => the main install program
├── prompt.sh
```

Install configuration is in config-vars.sh contains the following install options and default values:
Install configuration is in [config-vars.sh](scripts/common/config-vars.sh) contains the following install options and default values:

**Format for this list:** *install option* [default value] - *definition*

@@ -94,7 +94,6 @@ Install configuration is in config-vars.sh contains the following install option

Configuration items for setup.py are in template-env in ./dojo/settings/ and contain

*

### Installers workflow

@@ -111,6 +110,5 @@ Configuration items for setup.py are in template-env in ./dojo/settings/ and con
* REPO_BASE : The full path to where the DefectDojo source was cloned usually /opt/dojo/django-DefectDojo
* LIB_PATH : The full path to where the configuration values and libraries are for the DefectDojo installer which is SETUP_BASE + /scripts/common/
* DB_TYPPE : The database type DefectDojo will use - currently either SQLite, MySQL or PostgreSQL
*


0 comments on commit f3579b1

Please sign in to comment.
You can’t perform that action at this time.