Merge branch 'master' of https://github.com/TOoSmOotH/securityonion-saltstack

salt/kibana/init.sls

@@ -56,14 +56,14 @@ synckibanacustom:
 
 so-kibanaimage:
  cmd.run:
-   - name: docker pull --disable-content-trust=false soshybridhunter/so-kibana:HH1.1.0
+   - name: docker pull --disable-content-trust=false soshybridhunter/so-kibana:HH1.1.1
 
 # Start the kibana docker
 so-kibana:
   docker_container.running:
     - require:
       - so-kibanaimage
-    - image: soshybridhunter/so-kibana:HH1.1.0
+    - image: soshybridhunter/so-kibana:HH1.1.1
     - hostname: kibana
     - user: kibana
     - environment:

salt/playbook/init.sls

@@ -1,3 +1,20 @@
+{% set MASTERIP = salt['pillar.get']('master:mainip', '') %}
+
+playbookdb:
+  file.managed:
+    - name: /opt/so/conf/playbook/redmine.db
+    - source: salt://playbook/files/redmine.db
+    - user: 999
+    - group: 999
+    - makedirs: True
+    - replace: False
+
+playbookwebhook:
+  module.run:
+    - name: sqlite3.modify
+    - db: /opt/so/conf/playbook/redmine.db
+    - sql: "update webhooks set url = 'http://{{MASTERIP}}:7000/playbook/webhook' where project_id = 1"
+
 navigatorconfig:
   file.managed:
     - name: /opt/so/conf/playbook/navigator_config.json
@@ -18,6 +35,8 @@ so-playbook:
     - image: soshybridhunter/so-playbook:HH1.1.1
     - hostname: playbook
     - name: so-playbook
+    - binds:
+      - /opt/so/conf/playbook/redmine.db:/usr/src/redmine/sqlite/redmine.db:rw
     - port_bindings:
       - 0.0.0.0:3200:3000