summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wirzenius <liw@liw.fi>2019-10-05 18:25:29 +0300
committerLars Wirzenius <liw@liw.fi>2019-10-05 18:25:29 +0300
commit427585b7e59df40ae8d85684a1063eed20e6be69 (patch)
treef9dbf1ae74f8a322cf69b82d2faddcd8363b68b4
parent0b693f3639af84918e23af6d76bd06e7159aef2e (diff)
downloadansibleness-427585b7e59df40ae8d85684a1063eed20e6be69.tar.gz
Change: move vmdb2 websites to http.liw.fi
-rw-r--r--ansible/group_vars/all.yml3
-rw-r--r--ansible/http.liw.fi.yml13
-rw-r--r--ansible/pieni.yml12
3 files changed, 16 insertions, 12 deletions
diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml
index ad40765..ad233d3 100644
--- a/ansible/group_vars/all.yml
+++ b/ansible/group_vars/all.yml
@@ -1,6 +1,9 @@
liw_ssh_pub: |
ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDAlECa3tbFGXhB3Zh/4/GhM11THOThVfiuLqqJ2dpWHEClzpKJHpzzwWt7g9z/MMQNMsUJLy+okz+De6hdjjmYJ9kG9Sr3H4YKq6itGQMj7L/cH3WS3ynp0uy0oW3hf932vDZKQ8iy9vczXH+ERYl+4TYae1Jp4Hyf4/2IYxEfuhKctvSvqySST3Qk9JNZ71HFGOWhjH/MmoCLoT1v+HkqmHdYf/GMKGRo3gqCEGgCgNErYYIyKm3OF3dHXK+hyGLE/cZNu6fU5woW3rvtUCFt08Ri2pm0cnXXJn9jQIMxfS5Kkf64svwgzKmPqgX1f4flopYPlsBXduCgzbJvj+lpgauAk/i1A5B01CFa9sI4C6pHZmwk1qxRwN+4IXL2CQt+tDgYC84ZDDd8R7cNyL22a3KhMQmdHtvog1beAa3Ab+J+cafkXXN+Es9f1wQjzk7DiHupmJIVofBvPP+cRcB46rwha6ati8Fa5QkT9rXFNqQsKk7jq8TIi54Bm15OOa0jInGG3TM17b9Ftu2WTJSAaqgBnDfZiInK7HEvC6K/IBljrN3oGagmFZPrAvzw7d6C2/nKFAQtfoMcE5oWVDrJyjsmJ8oaru0E8rwj7mMvyKPgEMnXTGXLWDgEo50+i291m4bkCxVwiOPbPRvdMll1Y8qfBAPT76sY4Ikgcw/2iw== openpgp:0xBBE80E50
+ci_worker_ssh_pub: |
+ ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCWvVYqyPen0CFhfx9dzzCKNbQ7fUpbCRdlQ/PI4sAv5R+gjUYjZJ3HQQhdkEx6mwY+fGYgGIAY9xiTi+BzXSPPtuWUypB2/ee+Dh5Uqica1TCj/3txmFGE7qwD+AqoJYbDAD1x17AaCIEDgHv2wOQ2o8GlOKTK9mGgvZWTUgIUF7PObotg8/M6TV4NO3of7ZSJ0yqumU/GLaJ8UkvYVQ3Gj0w8tbX6xiJKcOnMyM+P+JIFRKKi/SzjymVfAie9OAlIcDEYTeT6dtqWYB6hT0/40D0ZcxOfIg07/m4A956hH9AzRKuz01w2phP2zQyHRUSOCWa5EWF/H9snxpeE5Ein liw@exolobe3
+
root_at_holywood2_ssh_key_pub: |
ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQD09fADKOhvnLtFIU4+seDAK0OsEEas20z+R/j3OEthXfOa0OP/2183H+PeEF4NLTvyvyxrTILqLiZ3hT6ISK5p8m09CdgJrtnwj1b5hMu1yKuSlBHmBQGksHms+6DyEsovhfDnjTd/B5KqfHPlrZ2Ng/wO06Tqys07SSNI9wzseg26RSYqHfXunkcvePkMbvk7eyEYGOGhpJqwOEw5byPUPoZEr1cWnB+ljzVo4bJ4z1QMNsE6V5eeP4pTlrPTASNunvqFHaKuE+t7IJTDe+k2QxbWPPmyCCLYcA53DlFmZTFZYYksI0iHFLe/fiIAb2yeo2PA65aI5CWr/N7qiZNj liw@exolobe3
diff --git a/ansible/http.liw.fi.yml b/ansible/http.liw.fi.yml
index 03acb44..596a9e8 100644
--- a/ansible/http.liw.fi.yml
+++ b/ansible/http.liw.fi.yml
@@ -22,6 +22,7 @@
comment: Ick website
authorized_keys: |
{{ liw_ssh_pub }}
+ {{ ci_worker_ssh_pub }}
letsencrypt: yes
letsencrypt_email: liw@liw.fi
@@ -47,3 +48,15 @@
ownermail: liw@liw.fi
letsencrypt: yes
letsencrypt_cert: static3
+
+ - domain: vmdb2.liw.fi
+ owner: ickliwfi
+ ownermail: liw@liw.fi
+ letsencrypt: yes
+ letsencrypt_cert: static4
+
+ - domain: vmdb2-manual.liw.fi
+ owner: ickliwfi
+ ownermail: liw@liw.fi
+ letsencrypt: yes
+ letsencrypt_cert: static4
diff --git a/ansible/pieni.yml b/ansible/pieni.yml
index 0fbf749..9daac1c 100644
--- a/ansible/pieni.yml
+++ b/ansible/pieni.yml
@@ -46,18 +46,6 @@
htpasswd: "{{ lookup('pipe', 'pass journal.liw.fi.htpasswd') }}"
htpasswd_name: "Private site by Lars. Go away."
- - domain: vmdb2.liw.fi
- owner: ickliwfi
- ownermail: liw@liw.fi
- letsencrypt: yes
- letsencrypt_cert: cert5
-
- - domain: vmdb2-manual.liw.fi
- owner: ickliwfi
- ownermail: liw@liw.fi
- letsencrypt: yes
- letsencrypt_cert: cert5
-
- domain: effireg.liw.fi
owner: ickliwfi
ownermail: liw@liw.fi