Page MenuHomeDevCentral
Files F54954632

D3673.diff
No OneTemporary
Actions

D3673.diff
View Options

diff --git a/pillar/credentials/vault.sls b/pillar/credentials/vault.sls
--- a/pillar/credentials/vault.sls
+++ b/pillar/credentials/vault.sls
@@ -180,6 +180,8 @@
- ops/secrets/nasqueron/rabbitmq/white-rabbit/erlang-cookie
- ops/secrets/nasqueron/rabbitmq/white-rabbit/root
+ - ops/secrets/nasqueron/reports/acquisitariat
+
- ops/secrets/nasqueron/sentry/app_key
- ops/secrets/nasqueron/sentry/geoipupdate
- ops/secrets/nasqueron/sentry/postgresql
diff --git a/roles/paas-docker/wrappers/files/run-report.sh b/roles/paas-docker/wrappers/files/run-report.sh
new file mode 100644
--- /dev/null
+++ b/roles/paas-docker/wrappers/files/run-report.sh
@@ -0,0 +1,46 @@
+#!/bin/sh
+
+# -------------------------------------------------------------
+# Run report
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# Project: Nasqueron
+# Description: Wrapper to run nasqueron-reports container
+# License: BSD-2-Clause
+# Source file: roles/paas-docker/wrappers/files/run-report.sh
+# -------------------------------------------------------------
+#
+# <auto-generated>
+# This file is managed by our rOPS SaltStack repository.
+#
+# Changes to this file may cause incorrect behavior
+# and will be lost if the state is redeployed.
+# </auto-generated>
+
+set -e
+
+# -------------------------------------------------------------
+# Arguments
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+if [ "$#" -eq 0 ]; then
+ echo "Usage: $0 <report to generate>" 1>&2;
+ exit 1
+fi
+
+REPORT=$1
+
+# -------------------------------------------------------------
+# Credentials
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+DB_USERNAME=$(credential nasqueron/reports/acquisitariat username)
+DB_PASSWORD=$(credential nasqueron/reports/acquisitariat)
+
+# -------------------------------------------------------------
+# Container
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+docker run --rm \
+ --link acquisitariat:mysql \
+ -e "DB_USERNAME=$DB_USERNAME" -e "DB_PASSWORD=$DB_PASSWORD" \
+ nasqueron/reports run-report "$REPORT"
diff --git a/roles/paas-docker/wrappers/init.sls b/roles/paas-docker/wrappers/init.sls
--- a/roles/paas-docker/wrappers/init.sls
+++ b/roles/paas-docker/wrappers/init.sls
@@ -12,7 +12,7 @@
# Wrapper binaries
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-{% for command in ['jenkins', 'phpbb', 'mysql', 'openfire', 'geoipupdate'] %}
+{% for command in ['jenkins', 'phpbb', 'mysql', 'openfire', 'geoipupdate', 'run-report'] %}
{{ dirs.bin }}/{{ command }}:
file.managed:
- source: salt://roles/paas-docker/wrappers/files/{{ command }}.sh

File Metadata

Mime Type
text/plain
Expires
Mon, Oct 26, 04:57 (19 h, 50 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
4219630
Default Alt Text
D3673.diff (2 KB)

Event Timeline

Nasqueron DevCentral · If it had been much bigger the moon would have had a core of ice. · Powered by Phabricator