release fixes (#171)

csirtgadgets · Dec 8, 2016 · 74a7ffd · 74a7ffd
1 parent f772489
commit 74a7ffd
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 10 deletions.
diff --git a/deployment/centos7/roles/centos7/files/cif-httpd.service b/deployment/centos7/roles/centos7/files/cif-httpd.service
@@ -6,7 +6,7 @@ Type=simple
 User=cif
 Group=cif
 PIDFile=/run/cif-httpd.pid
-ExecStart=/usr/bin/cif-httpd -d
+ExecStart=/usr/bin/cif-httpd
 KillMode=process
 Restart=on-failure
 KillSignal=SIGINT

diff --git a/deployment/centos7/roles/centos7/files/cif-router.service b/deployment/centos7/roles/centos7/files/cif-router.service
@@ -6,7 +6,7 @@ Type=simple
 User=cif
 Group=cif
 PIDFile=/run/cif-router.pid
-ExecStart=/usr/bin/cif-router -d
+ExecStart=/usr/bin/cif-router
 KillMode=process
 Restart=on-failure
 KillSignal=SIGINT

diff --git a/deployment/centos7/roles/centos7/files/csirtg-smrt.service b/deployment/centos7/roles/centos7/files/csirtg-smrt.service
@@ -6,7 +6,7 @@ Type=simple
 User=cif
 Group=cif
 PIDFile=/run/csirtg-smrt.pid
-ExecStart=/usr/bin/csirtg-smrt -d --remember --service --client cif
+ExecStart=/usr/bin/csirtg-smrt --remember --service --client cif --fireball --delay 1
 KillMode=process
 Restart=on-failure
 KillSignal=SIGINT

diff --git a/deployment/ubuntu14/roles/ubuntu14/files/cif-httpd.conf b/deployment/ubuntu14/roles/ubuntu14/files/cif-httpd.conf
@@ -2,7 +2,7 @@
 pidfile = /var/run/cif-httpd.pid
 
 [program:cif-httpd]
-command = cif-httpd -d
+command = cif-httpd
 autostart = true
 stderr_logfile = /var/log/cif/cif-httpd.log
 user = cif
diff --git a/deployment/ubuntu14/roles/ubuntu14/files/cif-router.conf b/deployment/ubuntu14/roles/ubuntu14/files/cif-router.conf
@@ -2,7 +2,7 @@
 pidfile = /var/run/cif-router.pid
 
 [program:cif-router]
-command = cif-router -d
+command = cif-router
 autostart = true
 stderr_logfile = /var/log/cif/cif-router.log
 user = cif

diff --git a/deployment/ubuntu14/roles/ubuntu14/files/csirtg-smrt.conf b/deployment/ubuntu14/roles/ubuntu14/files/csirtg-smrt.conf
@@ -2,7 +2,7 @@
 pidfile = /var/run/csirtg-smrt.pid
 
 [program:csirtg-smrt]
-command = csirtg-smrt --config /etc/cif/csirtg-smrt.yml --service -d --remember --client cif
+command = csirtg-smrt --config /etc/cif/csirtg-smrt.yml --service --remember --client cif --fireball --delay 1
 autostart = true
 stderr_logfile = /var/log/cif/csirtg-smrt.log
 user = cif

diff --git a/deployment/ubuntu16/roles/ubuntu16/files/csirtg-smrt.service b/deployment/ubuntu16/roles/ubuntu16/files/csirtg-smrt.service
@@ -6,7 +6,7 @@ Type=simple
 User=cif
 Group=cif
 PIDFile=/run/csirtg-smrt.pid
-ExecStart=/usr/local/bin/csirtg-smrt -d --remember --service --client cif --service
+ExecStart=/usr/local/bin/csirtg-smrt --remember --service --client cif --service --fireball --delay 1
 KillMode=process
 Restart=on-failure
 KillSignal=SIGINT

diff --git a/requirements.txt b/requirements.txt
@@ -1,7 +1,7 @@
 cython>=0.2
 https://github.com/zeromq/pyzmq/archive/f37052960e1dc510ea2c1d2e69a32d727afa9d69.tar.gz#egg=pyzmq>16.0.1
 #pyzmq>=16.0 # bug in the way pyzmq wheel is built
-https://github.com/csirtgadgets/bearded-avenger-sdk-py/archive/3.0.0a9.tar.gz
+https://github.com/csirtgadgets/bearded-avenger-sdk-py/archive/3.0.0a10.tar.gz
 Flask-Limiter>=0.9.3,<1.0
 limits>=1.1.1,<1.2
 maxminddb>=1.2.0,<1.3
@@ -15,6 +15,6 @@ elasticsearch_dsl<3.0.0,>=2.0.0
 setuptools>=18.5
 rdflib==4.2.1
 ujson>=1.35
-csirtg_indicator==0.0.0a20
+csirtg_indicator==0.0.0a24
 html5lib==1.0b8 # bug in csirtg-smrt upstream
-csirtg_smrt==0.0.0a15
+csirtg_smrt==0.0.0a16