summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPedro Alvarez <pedro.alvarez@codethink.co.uk>2015-11-03 16:03:58 +0000
committerPedro Alvarez <pedro.alvarez@codethink.co.uk>2015-11-04 12:51:19 +0000
commit230efbeb7d6e716d5e03ddf5f552a8d19ee4aff2 (patch)
tree97983a481e96b67aa3354b03ae06e73f98722f05
parent44e8dab8d4afeee9e68d59a6278b99e9f4a6d024 (diff)
downloadinfrastructure-230efbeb7d6e716d5e03ddf5f552a8d19ee4aff2.tar.gz
baserock_gerrit: Various fixes
- Fix some tasks that create files to be owned by gerrit user - Fix the path to the baserock_database folder, this change was missing since 2da9cfaba1f8aa8a9eed9d335fb6fed3d2b6a72a
-rw-r--r--baserock_gerrit/instance-config.yml6
1 files changed, 5 insertions, 1 deletions
diff --git a/baserock_gerrit/instance-config.yml b/baserock_gerrit/instance-config.yml
index 2b08991a..e9062580 100644
--- a/baserock_gerrit/instance-config.yml
+++ b/baserock_gerrit/instance-config.yml
@@ -22,7 +22,7 @@
run_gerrit: "{{ JRE_DIR }}/bin/java -jar /opt/gerrit/gerrit-{{ GERRIT_VERSION }}.war"
vars_files:
- - ../database/baserock_gerrit.database_password.yml
+ - ../baserock_database/baserock_gerrit.database_password.yml
tasks:
- name: add gerrit user
user:
@@ -60,6 +60,8 @@
- name: initialise Gerrit application directory
command: "{{ run_gerrit }} init -d /srv/gerrit creates=/srv/gerrit/etc/gerrit.config"
+ sudo: yes
+ sudo_user: gerrit
- name: extract and install some plugins for gerrit
shell: unzip /opt/gerrit/gerrit-{{ GERRIT_VERSION}}.war WEB-INF/plugins/{{ item }}.jar -p > /srv/gerrit/plugins/{{ item }}.jar
@@ -68,6 +70,8 @@
with_items:
- replication
- download-commands
+ sudo: yes
+ sudo_user: gerrit
- name: download extra Java libraries
get_url: