summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wirzenius <liw@liw.fi>2019-01-05 21:14:07 +0200
committerLars Wirzenius <liw@liw.fi>2019-01-05 21:14:07 +0200
commita6b3def633dd639dfbd42c3d417751a89c9cd357 (patch)
tree143692b6092118dad0e7f45c6021cac289fb65c4
parent3e9488bd386e343bd11506be5376155bd0cc6831 (diff)
downloadliw-ci-a6b3def633dd639dfbd42c3d417751a89c9cd357.tar.gz
Change: add effi-reg
-rw-r--r--ci-prod-programs.ick47
-rw-r--r--ci-prod-websites.ick12
2 files changed, 59 insertions, 0 deletions
diff --git a/ci-prod-programs.ick b/ci-prod-programs.ick
index dc388c5..ae88a32 100644
--- a/ci-prod-programs.ick
+++ b/ci-prod-programs.ick
@@ -810,6 +810,28 @@ projects:
- ick/get_sources
- ickui
+- project: effi-reg
+ parameters:
+ sources:
+ - name: code
+ repo: git://git.liw.fi/ick2-ansible
+ ref: master
+ location: src
+ - name: helper
+ repo: git://git.qvarnlabs.net/debian-ansible
+ ref: master
+ location: debian-ansible
+ - name: vars
+ repo: ssh://git@git.liw.fi/private/liw/ci-prod-vars
+ ref: master
+ location: vars
+ systree_name: systrees-debian-stretch-build-essential
+ notify: [liw@liw.fi]
+ pipelines:
+ - ick/setup_container
+ - ick/get_sources
+ - run_ansible
+
pipelines:
- pipeline: ickui
@@ -828,3 +850,28 @@ pipelines:
- action: rsync
where: host
+
+- pipeline: run_ansible
+ parameters:
+ - notify
+ actions:
+ - where: host
+ shell: |
+ cp -a /home/_ickwm/.ssh dot-ssh
+
+ - where: container
+ shell: |
+ mv dot-ssh /root/.ssh
+ chown -R root:root /root/.ssh
+
+ - where: container
+ shell: |
+ sha1sum /root/.ssh/id_rsa
+ find /root /workspace -ls
+
+ echo StrictHostKeyChecking no >> /etc/ssh/ssh_config
+
+ export ANSIBLE_ROLES_PATH=/workspace/debian-ansible/roles
+ apt install -y ansible
+ cd src
+ ansible-playbook -i hosts.effi effi.yml -e reg_domain=effi-reg.vm.liw.fi -e @/workspace/vars/effi-reg.yml
diff --git a/ci-prod-websites.ick b/ci-prod-websites.ick
index 2a9f2e0..b347d61 100644
--- a/ci-prod-websites.ick
+++ b/ci-prod-websites.ick
@@ -102,6 +102,17 @@ projects:
repo: ssh://git@git.liw.fi/ick-biz
pipelines: *ikiwiki_pipelines
+
+- project: effireg.liw.fi
+ parameters:
+ <<: *ikiwiki_params
+ rsync_target: ickliwfi@pieni.net:/srv/http/effireg.liw.fi
+ sources:
+ - name: source
+ ref: master
+ location: src
+ repo: git://git.liw.fi/effireg-website
+ pipelines: *ikiwiki_pipelines
- project: ick-yarns.liw.fi
@@ -171,6 +182,7 @@ pipelines:
dirname = source['location']
RUN('rm', '-rf', 'html', 'tmp')
RUN('ql-ikiwiki-preprocess', dirname, 'tmp', env=env)
+ RUN('find', '-ls')
RUN('sed', '-i', '/^srcdir:/d', 'tmp/ikiwiki.setup', env=env)
RUN('sed', '-i', '/^destdir:/d', 'tmp/ikiwiki.setup', env=env)
with open('tmp/ikiwiki.setup', 'a') as f: