summaryrefslogtreecommitdiff
path: root/baserock_webserver
diff options
context:
space:
mode:
authorPedro Alvarez <pedro.alvarez@codethink.co.uk>2018-08-07 14:01:57 +0100
committerPedro Alvarez <pedro.alvarez@codethink.co.uk>2018-08-07 14:03:52 +0100
commit23d324fcaf681d2b2322a036d408e80e11e86520 (patch)
treeb526fd36d9c498932b49569cc24bada3f9f816ea /baserock_webserver
parenta90eef0b2221129a3e71411b6a3df63733a16968 (diff)
downloadinfrastructure-23d324fcaf681d2b2322a036d408e80e11e86520.tar.gz
Use registered gitlab-br-bot user
Diffstat (limited to 'baserock_webserver')
-rw-r--r--baserock_webserver/gitlab-bot/config.js1
-rw-r--r--baserock_webserver/gitlab-bot/gitlab_bot_secrets.yml10
-rw-r--r--baserock_webserver/gitlab-bot/gitlab_buildstream_secret.yml8
-rw-r--r--baserock_webserver/instance-gitlab-bot-config.yml2
4 files changed, 12 insertions, 9 deletions
diff --git a/baserock_webserver/gitlab-bot/config.js b/baserock_webserver/gitlab-bot/config.js
index e92d935d..b94f34c3 100644
--- a/baserock_webserver/gitlab-bot/config.js
+++ b/baserock_webserver/gitlab-bot/config.js
@@ -123,6 +123,7 @@ module.exports = {
// IRC nick/names for the bot
nick: 'gitlab-br-bot',
+ password: '{{ gitlab_bot_password }}',
userName: 'gitlab-br-bot',
realName: 'Gitlab Bot provided by Baserock',
diff --git a/baserock_webserver/gitlab-bot/gitlab_bot_secrets.yml b/baserock_webserver/gitlab-bot/gitlab_bot_secrets.yml
new file mode 100644
index 00000000..e25172e0
--- /dev/null
+++ b/baserock_webserver/gitlab-bot/gitlab_bot_secrets.yml
@@ -0,0 +1,10 @@
+$ANSIBLE_VAULT;1.1;AES256
+61346433666533613665376130646438613334333839323766323963313337653038316165383166
+3537633331366339363630316131376661616564623135620a623239653938383266653335396335
+64323365313962623639336663363038663335323166363035326437356264646334613931373962
+3062653034303538610a343938633035393465323231616664626532393136643431633131643864
+30316565353136323566336464313865343565346539306533383739636230653336663831313765
+65623334646261613137383230626362323336376436633463383166653865303666633363303131
+38393664383361393262306639306463343664306230626266316462663436376163386262303663
+33623831626237643635306363663237656261323561393834383066623830336538653938663262
+37303437393636313063653761316138336535623266366262613938623238326139
diff --git a/baserock_webserver/gitlab-bot/gitlab_buildstream_secret.yml b/baserock_webserver/gitlab-bot/gitlab_buildstream_secret.yml
deleted file mode 100644
index 53ae22e0..00000000
--- a/baserock_webserver/gitlab-bot/gitlab_buildstream_secret.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-$ANSIBLE_VAULT;1.1;AES256
-35376536656664653761336331643738343738643365623832626464313335383439623761313434
-3634373330363634666566353766373862643266373431380a396566356261653937343131666338
-36356133636465323135643264306461386437613064636164656361656264616239333236353430
-3734343639313337620a396431356335376638316339646362633436613065646366326134363032
-61613132383832346637396666373761363230666234303530646533336363653139643264623862
-39616663643138623538383336323538313963396463653563643134326664643930303135383039
-623636663031333934633261663436303735
diff --git a/baserock_webserver/instance-gitlab-bot-config.yml b/baserock_webserver/instance-gitlab-bot-config.yml
index 29368122..aac522a7 100644
--- a/baserock_webserver/instance-gitlab-bot-config.yml
+++ b/baserock_webserver/instance-gitlab-bot-config.yml
@@ -2,7 +2,7 @@
---
- hosts: webserver
vars_files:
- - gitlab-bot/gitlab_buildstream_secret.yml
+ - gitlab-bot/gitlab_bot_secrets.yml
vars:
- gitlab_to_irc_url: https://gitlab.com/palvarez89/gitlab-to-irc
- gitlab_to_irc_branch: master