Skip to content

Commit

Permalink
Commiting these changes for logging but superviord implementation wor…
Browse files Browse the repository at this point in the history
…ks on docker but not kubernetes so I will make changes.
  • Loading branch information
seizadi committed Oct 13, 2020
1 parent d804744 commit d829789
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 6 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ docker run --rm -it -p 80:80 soheileizadi/dvwa

```

The [Dockerfile](deploy/Dockerfile) in the project is available if you like to customize your container.
The [Dockerfile](deploy/Dockerfile) in the project is available if you would like to customize the container.

Setting up ReCAPTCHA with docker, You'll need to generate your keys at:
[https://www.google.com/recaptcha/admin](https://www.google.com/recaptcha/admin).
Expand Down
7 changes: 6 additions & 1 deletion deploy/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Here we demonstrate deployment on
[minikube](https://kubernetes.io/docs/tasks/tools/install-minikube/) but chart can be deployed on any cluster:

```bash
start minikube
minikube start
```

```bash
Expand All @@ -45,6 +45,11 @@ Select the dvwa service:
|-------------|-----------------|--------------|----------------------------|
```

Delete the deployment
```bash
helm uninstall seizadi-dvwa
```

## Update to PHP7

Upgrade to Ubuntu (18.04) is running PHP (7.2), built against master.
6 changes: 4 additions & 2 deletions deploy/conf/start-logging.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#!/bin/bash
exec tail -f /var/log/mysql/mysql.log > /proc/1/fd/1
exec tail -f /var/log/mysql/mysql-slow.log > /proc/1/fd/1
# exec tail -f /var/log/mysql/mysql.log > /proc/1/fd/1
# exec tail -f /var/log/mysql/mysql-slow.log > /proc/1/fd/1
exec tail -f /var/log/mysql/*.log -f /var/log/apache2/*.log

3 changes: 3 additions & 0 deletions deploy/conf/supervisord-apache2.conf
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,6 @@ command=/start-apache2.sh
numprocs=1
autostart=true
autorestart=true
stdout_logfile=/dev/fd/1
stdout_logfile_maxbytes=0
redirect_stderr=true
5 changes: 3 additions & 2 deletions deploy/conf/supervisord-logging.conf
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ command=/start-logging.sh
numprocs=1
autostart=true
autorestart=true
#stdout_logfile=/proc/1/fd/1
#stderr_logfile=/proc/1/fd/1
stdout_logfile=/dev/fd/1
stdout_logfile_maxbytes=0
redirect_stderr=true

3 changes: 3 additions & 0 deletions deploy/conf/supervisord-mysql.conf
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,6 @@ command=/start-mysql.sh
numprocs=1
autostart=true
autorestart=true
stdout_logfile=/dev/fd/1
stdout_logfile_maxbytes=0
redirect_stderr=true

0 comments on commit d829789

Please sign in to comment.