diff options
author | Lars Wirzenius <liw@liw.fi> | 2018-06-13 15:01:18 +0300 |
---|---|---|
committer | Lars Wirzenius <liw@liw.fi> | 2018-06-13 15:01:18 +0300 |
commit | 83b3574f3abf2c367a7a687867273e6259975ce6 (patch) | |
tree | bf963ee59b71a10d0a187b8e1ff8e36ecb1acbe1 /group_vars | |
parent | 363fbccdbe5e9e6774f9a949cc1d8670d6287c48 (diff) | |
download | ick2-ansible-83b3574f3abf2c367a7a687867273e6259975ce6.tar.gz |
Change: update stuff for deploying working ick instances
Diffstat (limited to 'group_vars')
-rw-r--r-- | group_vars/apt.yml | 18 | ||||
-rw-r--r-- | group_vars/ickhost.yml (renamed from group_vars/ick.yml) | 13 | ||||
-rw-r--r-- | group_vars/notify.yml | 5 | ||||
-rw-r--r-- | group_vars/workers.yml | 7 |
4 files changed, 33 insertions, 10 deletions
diff --git a/group_vars/apt.yml b/group_vars/apt.yml new file mode 100644 index 0000000..70fa580 --- /dev/null +++ b/group_vars/apt.yml @@ -0,0 +1,18 @@ +apt_uploader_ssh_public_keys: + - "{{ wm_ssh_key_pub }}" +apt_signing_key: "{{ lookup('pipe', 'pass show ick2/apt_key') }}" +apt_signing_key_pub: "{{ lookup('pipe', 'pass show ick2/apt_key.pub') }}" +apt_signing_key_fingerprint: | + {{ lookup('pipe', 'pass show ick2/apt_key.pub | gpg --with-colons | grep "^fpr:" | cut -d: -f10') }} +apt_admin_email: liw@liw.fi +apt_distributions: + - codename: stretch + description: Release packages for stretch + - codename: stretch-ci + description: CI builds for stretch + - codename: unstable + description: Release packages for unstable + - codename: unstable-ci + description: CI builds for unstable + - codename: liw-ci + description: CI builds for unstable from liw diff --git a/group_vars/ick.yml b/group_vars/ickhost.yml index d349d4f..ec545e4 100644 --- a/group_vars/ick.yml +++ b/group_vars/ickhost.yml @@ -2,8 +2,7 @@ debian_codename: stretch debian_mirror: deb.debian.org debian_mirror_src: deb.debian.org -wm_ssh_key: "{{ lookup('pipe', 'pass show ick2/wm_ssh_key') }}" -wm_ssh_key_pub: "{{ lookup('pipe', 'pass show ick2/wm_ssh_key_pub') }}" +ci_prefix: "" sources_lists: - repo: "deb http://code.liw.fi/debian stretch main" @@ -14,18 +13,15 @@ token_private_key: "{{ lookup('pipe', 'pass show ick2/token_key') }}" token_public_key: "{{ lookup('pipe', 'pass show ick2/token_key.pub') }}" tls_certificate: "{{ lookup('pipe', 'pass show ick2/ick.pem') }}" -controller_domain: 127.0.0.1 controller_port: 12765 - -artifact_store_domain: 127.0.0.1 artifact_store_port: 12766 - qvisqve_port: 10000 -notification_service_port: 12767 +notify_port: 12767 controller_url: "https://{{ controller_domain }}" artifact_store_url: "https://{{ artifact_store_domain }}" qvisqve_url: "https://{{ qvisqve_domain }}" +notify_url: "https://{{ notify_domain }}/notify" apt_uploader_ssh_public_keys: - "{{ wm_ssh_key_pub }}" @@ -35,4 +31,5 @@ apt_signing_key_fingerprint: | {{ lookup('pipe', 'pass show ick2/apt_key.pub | gpg --with-colons | grep "^fpr:" | cut -d: -f10') }} apt_admin_email: liw@liw.fi -ci_prefix: "" +wm_ssh_key: "{{ lookup('pipe', 'pass show ick2/wm_ssh_key') }}" +wm_ssh_key_pub: "{{ lookup('pipe', 'pass show ick2/wm_ssh_key_pub') }}" diff --git a/group_vars/notify.yml b/group_vars/notify.yml new file mode 100644 index 0000000..c620183 --- /dev/null +++ b/group_vars/notify.yml @@ -0,0 +1,5 @@ +smtp_server: pieni.net +smtp_port: 587 +smtp_user: pienirelay +smtp_password: "{{ lookup('pipe', 'pass show pieni.net/pienirelay') }}" + diff --git a/group_vars/workers.yml b/group_vars/workers.yml index c5046dc..6501d88 100644 --- a/group_vars/workers.yml +++ b/group_vars/workers.yml @@ -1,2 +1,5 @@ -wm_ssh_key: "{{ lookup('pipe', 'pass show ick2/wm_ssh_key') }}" -wm_ssh_key_pub: "{{ lookup('pipe', 'pass show ick2/wm_ssh_key_pub') }}" +unix_users: + - username: _ickwm + sudo: yes + ssh_key: "{{ wm_ssh_key }}" + ssh_key_pub: "{{ wm_ssh_key_pub }}" |