chg: [app:config] Avoid overriding config file and git conflicts
This commit is contained in:
parent
99f9751e22
commit
84ab2665d7
3 changed files with 5 additions and 2 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
@ -1,5 +1,6 @@
|
||||||
__pycache__
|
__pycache__
|
||||||
venv
|
venv
|
||||||
|
config.py
|
||||||
misp_cache.sqlite
|
misp_cache.sqlite
|
||||||
|
|
||||||
# Logs
|
# Logs
|
||||||
|
|
|
@ -8,12 +8,15 @@ source venv/bin/activate
|
||||||
|
|
||||||
# Install deps
|
# Install deps
|
||||||
pip3 install -r REQUIREMENTS
|
pip3 install -r REQUIREMENTS
|
||||||
|
|
||||||
|
# Create config file and adapt it to your needs
|
||||||
|
cp config.py.sample config.py
|
||||||
```
|
```
|
||||||
|
|
||||||
## Running the PROD setup
|
## Running the PROD setup
|
||||||
```bash
|
```bash
|
||||||
python3 server.py
|
python3 server.py
|
||||||
# Access the page http://localhost:3000 with your browser
|
# Access the page http://localhost:4000 with your browser
|
||||||
```
|
```
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -18,7 +18,6 @@ logger = logging.getLogger('misp-exercise-dashboard')
|
||||||
format = '[%(levelname)s] %(asctime)s - %(message)s'
|
format = '[%(levelname)s] %(asctime)s - %(message)s'
|
||||||
formatter = logging.Formatter(format)
|
formatter = logging.Formatter(format)
|
||||||
logging.basicConfig(filename='misp-exercise-dashboard.log', encoding='utf-8', level=logging.DEBUG, format=format)
|
logging.basicConfig(filename='misp-exercise-dashboard.log', encoding='utf-8', level=logging.DEBUG, format=format)
|
||||||
# create console handler and set level to debug
|
|
||||||
ch = logging.StreamHandler()
|
ch = logging.StreamHandler()
|
||||||
ch.setLevel(logging.INFO)
|
ch.setLevel(logging.INFO)
|
||||||
ch.setFormatter(formatter)
|
ch.setFormatter(formatter)
|
Loading…
Reference in a new issue