update the demo accordingly to latest changes

docker/demo/docker-burpui/assets/config/burp-ui/burpui.cfg

@@ -22,12 +22,6 @@ auth = basic
 # list misc/acl directory to see the available backends
 # default is no ACL
 acl = basic
-# You can change the prefix if you are behind a reverse-proxy under a custom
-# root path. For example: /burpui
-# You can also configure your reverse-proxy to announce the prefix through the
-# 'X-Script-Name' header. In this case, the bellow prefix will be ignored in
-# favour of the one announced by your reverse-proxy
-prefix = none
 demo = true
 dsn = @DSN@
 piwik_url = @PIWIK_URL@
@@ -58,6 +52,12 @@ database = postgresql://burpui:burpui@demo-pg/burpuidb
 # limit the API rate
 limiter = true
 ratio = 60/minute
+# You can change the prefix if you are behind a reverse-proxy under a custom
+# root path. For example: /burpui
+# You can also configure your reverse-proxy to announce the prefix through the
+# 'X-Script-Name' header. In this case, the bellow prefix will be ignored in
+# favour of the one announced by your reverse-proxy
+prefix = none
 
 [WebSocket]
 ## This section contains WebSocket server specific options.
@@ -120,65 +120,6 @@ zip64 = true
 # `server_can_restore = 0`
 noserverrestore = true
 
-## burp backend specific options
-#[Burp]
-## burp status address (can only be '127.0.0.1' or '::1')
-#bhost = ::1
-## burp status port
-#bport = 4972
-## burp binary
-#burpbin = /usr/sbin/burp
-## vss_strip binary
-#stripbin = /usr/sbin/vss_strip
-## burp client configuration file used for the restoration (Default: None)
-#bconfcli = /etc/burp/burp.conf
-## burp server configuration file used for the setting page
-#bconfsrv = /etc/burp/burp-server.conf
-## temporary directory to use for restoration
-#tmpdir = /tmp/bui
-## how many time to wait for the monitor to answer (in seconds)
-#timeout = 15
-
-## ldapauth specific options
-#[LDAP]
-## Backend priority. Higher is first
-#priority = 1
-## LDAP host
-#host = 127.0.0.1
-## LDAP port
-#port = 389
-## Encryption type to LDAP server (none, ssl or tls)
-## - try tls if unsure, otherwise ssl on port 636
-#encryption = ssl
-## specifies if the server certificate must be validated, values can be:
-##  - none (certificates are ignored)
-##  - optional (not required, but validated if provided)
-##  - required (required and validated)
-#validate = none
-## SSL or TLS version to use, can be one of the following:
-##  - SSLv2
-##  - SSLv3
-##  - SSLv23
-##  - TLSv1
-##  - TLSv1_1 (Available only with openssl version 1.0.1+, requires python 2.7.9 or higher)
-#version = TLSv1
-## the file containing the certificates of the certification authorities
-#cafile = none
-## Attribute to use when searching the LDAP repository
-##searchattr = sAMAccountName
-#searchattr = uid
-## LDAP filter to find users in the LDAP repository
-##  - {0} will be replaced by the search attribute
-##  - {1} will be replaced by the login name
-##filter = (&({0}={1})(burpui=1))
-##filter = (&({0}={1})(|(userAccountControl=512)(userAccountControl=66048)))
-## LDAP base
-#base = ou=users,dc=example,dc=com
-## Binddn to list existing users
-#binddn = cn=admin,dc=example,dc=com
-## Bindpw to list existing users
-#bindpw = Sup3rS3cr3tPa$$w0rd
-
 ## basicauth specific options
 ## Note: in case you leave this section commented, the default login/password
 ## is admin/admin
@@ -239,28 +180,8 @@ admin = admin
 +moderator = moderator
 demo = '{"agents": {"Burp1": ["demo2"]}}'
 
-## If you set standalone to 'false', add at least one section like this per
-## bui-agent
-#[Agent:agent1]
-## bui-agent address
-#host = 192.168.1.1
-## bui-agent port
-#port = 10000
-## bui-agent password
-#password = azerty
-## enable SSL
-#ssl = true
-
-#[Agent:agent2]
-## bui-agent address
-#host = 192.168.2.1
-## bui-agent port
-#port = 10000
-## bui-agent password
-#password = ytreza
-## enable SSL
-#ssl = true
-
+# If you set standalone to 'false', add at least one section like this per
+# bui-agent
 [Agent:Burp1]
 host = demo-burp1
 port = 10000

docker/demo/docker-burpui/assets/init

@@ -96,6 +96,7 @@ EOF
   sed -i -r "s'@BURPUI_VERBOSE@'$BURPUI_VERBOSE'" /etc/supervisor.d/gunicorn.ini
 
   sed -r "s'@BURPUI_CONFIG@'$BURPUI_CONFIG'" /etc/supervisor.d/bui-celery.ini.sample >/etc/supervisor.d/bui-celery.ini
+  sed -r "s'@BURPUI_CONFIG@'$BURPUI_CONFIG'" /etc/supervisor.d/bui-celery-beat.ini.sample >/etc/supervisor.d/bui-celery-beat.ini
 
   sed -r "s'@GUNICORN_WORKERS@'$GUNICORN_WORKERS';s'@GUNICORN_WORKER_CLASS@'$GUNICORN_WORKER_CLASS'" /etc/burp-ui/burpui_gunicorn.py.sample >/etc/burp-ui/burpui_gunicorn.py
 
@@ -109,6 +110,7 @@ EOF
 
   echo "Starting bui-celery..."
   supervisorctl start bui-celery >/dev/null
+  supervisorctl start bui-celery-beat >/dev/null
 
   echo "Starting gunicorn..."
   supervisorctl start gunicorn >/dev/null
@@ -142,6 +144,9 @@ appStop() {
       supervisorctl stop websocket-$i
     done
   }
+  echo "Stopping celery..."
+  supervisorctp stop celery-beat >/dev/null
+  supervisorctl stop celery >/dev/null
   echo "Stopping gunicorn..."
   supervisorctl stop gunicorn >/dev/null
   echo "Stopping crond..."