Add: vmdb2dev VM to hosts file

11 files changed, 39 insertions, 34 deletions

diff --git a/ansible/exolobe1.yml b/ansible/exolobe1.yml
index cb026d8..22e81a4 100644
--- a/ansible/exolobe1.yml
+++ b/ansible/exolobe1.yml
@@ -1,5 +1,5 @@
 - hosts: exolobe1
-  remote_user: ansible
+  remote_user: liw
   become: yes
   roles:
     - sane_debian_system
@@ -16,10 +16,13 @@
     - writing-dev-env
     - debian-dev-env
     - rust-dev-env
-    - python-dev-env
-    - vmdb2-dev-env
-    - ick2-dev-env
+#    - python-dev-env
+#    - vmdb2-dev-env
+#    - ick2-dev-env
     - tex-dev-env
+#    - chaoskey-host
+#    - vmhost
+    - ansible
   vars:
     hostname: exolobe1
     debian_codename: unstable
@@ -46,7 +49,10 @@
       - repo: |
           deb http://code.liw.fi/debian unstable main
         signing_key: "{{ code_liw_fi_signing_key }}"
-        keyring_package: code.liw.fi-keyring
+#        keyring_package: code.liw.fi-keyring
       - repo: |
           deb http://apt.qvarnlabs.net/debian stretch main
         signing_key: "{{ apt_qvarnlabs_net_signing_key }}"
+      - repo: |
+          deb https://riot.im/packages/debian sid main
+        signing_key: "{{ riot_im_signing_key }}"
diff --git a/ansible/hosts b/ansible/hosts
index 88e9909..6baeadf 100644
--- a/ansible/hosts
+++ b/ansible/hosts
@@ -9,6 +9,8 @@ holywood2
 
 pieni                   ansible_ssh_host=koom.pieni.net  debian_codename=stretch
 
+vmdb2dev
+
 [ick-workers]
 ick3-unstable           hostname=ick3-unstable  debian_codename=unstable pbuilder_othermirror_distro=unstable
 ick3-stretch            hostname=ick3-stretch   debian_codename=stretch pbuilder_othermirror_distro=unstable
diff --git a/ansible/pieni.yml b/ansible/pieni.yml
index 9963d17..3712b3e 100644
--- a/ansible/pieni.yml
+++ b/ansible/pieni.yml
@@ -38,14 +38,6 @@
         ownermail: liw@liw.fi
         letsencrypt: yes
 
-      - domain: pm.liw.fi
-        owner: ickliwfi
-        ownermail: liw@liw.fi
-        letsencrypt: yes
-        letsencrypt_cert: cert3
-        htpasswd: "{{ lookup('pipe', 'pass pm.liw.fi.htpasswd') }}"
-        htpasswd_name: "Private site by Lars"
-
       - domain: ick.liw.fi
         owner: ickliwfi
         ownermail: liw@liw.fi
diff --git a/ansible/roles/ansible/tasks/main.yml b/ansible/roles/ansible/tasks/main.yml
index c50fa54..37bd817 100644
--- a/ansible/roles/ansible/tasks/main.yml
+++ b/ansible/roles/ansible/tasks/main.yml
@@ -1,13 +1,6 @@
-- name: install ansible
-  apt: name=ansible
-
-- name: install python-boto
-  apt: name=python-boto
-
-- name: install pass
-  apt: name=pass
-
-# We need this to create VM images to be deployed. Not specifically
-# for Ansible itself.
-- name: install vmdebootstrap
-  apt: name=vmdebootstrap
+- name: "install packages"
+  apt:
+    name: "{{ item }}"
+  with_items:
+    - ansible
+    - pass
diff --git a/ansible/roles/debian-dev-env/tasks/main.yml b/ansible/roles/debian-dev-env/tasks/main.yml
index 98aeb7c..c8557e8 100644
--- a/ansible/roles/debian-dev-env/tasks/main.yml
+++ b/ansible/roles/debian-dev-env/tasks/main.yml
@@ -7,4 +7,4 @@
     - devscripts
     - pbuilder
     - reprepro
-    - bumper
+#    - bumper
diff --git a/ansible/roles/gnome-system/tasks/main.yml b/ansible/roles/gnome-system/tasks/main.yml
index efb8237..3481d62 100644
--- a/ansible/roles/gnome-system/tasks/main.yml
+++ b/ansible/roles/gnome-system/tasks/main.yml
@@ -5,7 +5,7 @@
   with_items:
     - gnome
     - liferea
-    - desktop-cronish
+#    - desktop-cronish
     - handbrake
     - handbrake-cli
     - devhelp
@@ -51,6 +51,7 @@
     - cups
     - system-config-printer
     - darktable
+    - riot-web
 
     # This seems to be wanted by something in the GNOME app stack.
     # Installing it will stop a lot of apps from whinging at startup.
diff --git a/ansible/roles/gnupg-workstation/tasks/main.yml b/ansible/roles/gnupg-workstation/tasks/main.yml
index 6d064cc..ed253cd 100644
--- a/ansible/roles/gnupg-workstation/tasks/main.yml
+++ b/ansible/roles/gnupg-workstation/tasks/main.yml
@@ -5,5 +5,5 @@
     - gnupg
     - scdaemon
     - pass
-    - extrautils
+#    - extrautils
     - oathtool
diff --git a/ansible/roles/journal-workstation/tasks/main.yml b/ansible/roles/journal-workstation/tasks/main.yml
index adf8431..2f9e694 100644
--- a/ansible/roles/journal-workstation/tasks/main.yml
+++ b/ansible/roles/journal-workstation/tasks/main.yml
@@ -2,6 +2,6 @@
   apt:
     name: "{{ item }}"
   with_items:
-    - jt
+#    - jt
     - ikiwiki
 
diff --git a/ansible/roles/mail-client/tasks/main.yml b/ansible/roles/mail-client/tasks/main.yml
index 3af3106..a4f4a0d 100644
--- a/ansible/roles/mail-client/tasks/main.yml
+++ b/ansible/roles/mail-client/tasks/main.yml
@@ -8,7 +8,7 @@
     - offlineimap
     - procmail
     - wotsap
-    - clab
+#    - clab
     - urlview
 
 # A mail client needs to send mail. I prefer to send via a local MTA,
diff --git a/ansible/roles/vmdb2-dev-env/tasks/main.yml b/ansible/roles/vmdb2-dev-env/tasks/main.yml
index 69d2869..bc6c361 100644
--- a/ansible/roles/vmdb2-dev-env/tasks/main.yml
+++ b/ansible/roles/vmdb2-dev-env/tasks/main.yml
@@ -3,9 +3,8 @@
     name: "{{ item }}"
   with_items:
     - cmdtest
-    - python3-coverage-test-runner
+    - python3-cliapp
     - python3-jinja2
-    - pylint3
     - dpkg-dev
     - lintian
     - devscripts
@@ -16,3 +15,7 @@
     - pandoc
     - debootstrap
     - kpartx
+    - parted
+    - lvm2
+    - python3-coverage-test-runner
+    - cryptsetup
diff --git a/ansible/vmdb2dev.yml b/ansible/vmdb2dev.yml
index 92c4e9d..9f7524f 100644
--- a/ansible/vmdb2dev.yml
+++ b/ansible/vmdb2dev.yml
@@ -3,7 +3,15 @@
   become: yes
   roles:
     - sane_debian_system
+    - comfortable-debian-system
     - unix_users
     - version-controller
     - vmdb2-dev-env
-    - liw-usual
+  vars:
+    debian_codename: unstable
+    hostname: vmdb2dev
+    unix_users:
+      - username: liw
+        sudo: yes
+        authorized_keys: |
+          {{ liw_ssh_pub }}