Merge branch 'larsb/ansible-master'

client/templates/hosts.j2

 127.0.0.1	localhost
-127.0.1.1	{{ inventory_hostname }}.{{ domain[0] }}	{{ inventory_hostname }}
+127.0.1.1	{{ inventory_hostname }}.{{ domain }}	{{ inventory_hostname }}
 
 # The following lines are desirable for IPv6 capable hosts
 ::1     localhost ip6-localhost ip6-loopback

terminalserver/tasks/main.yml

+---
+# file: roles/portal/tasks/main.yml
+
+- name: ensure additional software is installed
+  apt: name={{ item }} state=present
+  with_items:
+    - etherwake
+    - wakeonlan
+  tags:
+    - packages
+
+- include: x2go.yml
+- meta: flush_handlers

terminalserver/tasks/x2go.yml

+---
+# file: roles/portal/tasks/x2go.yml
+
+- name: ensure apt key for x2go is present
+  apt_key: keyserver=keys.gnupg.net id=E1F958385BFE2B6E state=present
+  tags:
+    - x2go
+    - repos
+
+- name: ensure repository for x2go is in apt sources
+  apt_repository: repo='deb http://packages.x2go.org/debian jessie main' state=present
+  tags:
+    - x2go
+    - repos
+
+- name: ensure apt cache is updated
+  apt: update_cache=yes
+  tags:
+    - x2go
+    - packages
+
+- name: ensure x2go keyring is installed
+  apt: name=x2go-keyring state=present
+  tags:
+    - x2go
+    - packages
+
+- name: ensure apt cache is updated again
+  apt: update_cache=yes
+  tags:
+    - x2go
+    - packages
+
+- name: ensure x2go server is installed
+  apt: name={{ item }} state=latest
+  with_items:
+    - x2goserver
+    - x2goserver-xsession
+  tags:
+    - x2go
+    - packages
+
+- name: ensure x2go server is running and enabled
+  service: name=x2goserver state=running enabled=yes
+  tags:
+    - x2go
+    - service