Merge pull request #3 from cisagov/improvement/split-xfce-into-separa…

…te-role

Split the Xfce foo into a separate role

defaults/main.yml

@@ -3,5 +3,5 @@
 
 # The VNC username
 username: vnc
-# The VNC password
-password: vnc_password
+# Generate a random VNC password and save it to /tmp
+password: "{{ lookup('password', '/tmp/vnc_password.txt') }}"

meta/main.yml

@@ -6,9 +6,9 @@ galaxy_info:
   license: CC0
   min_ansible_version: 2.0
   platforms:
-    # - name: Amazon
-    #   versions:
-    #     - 2
+    - name: Amazon
+      versions:
+        - 2
     - name: Debian
       versions:
         - stretch

molecule/default/molecule.yml

@@ -6,13 +6,13 @@ driver:
 lint:
   name: yamllint
 platforms:
-  # - name: amazonlinux2_systemd
-  #   image: geerlingguy/docker-amazonlinux2-ansible:latest
-  #   privileged: yes
-  #   volumes:
-  #     - /sys/fs/cgroup:/sys/fs/cgroup:ro
-  #   command: /lib/systemd/systemd
-  #   pre_build_image: yes
+  - name: amazonlinux2_systemd
+    image: geerlingguy/docker-amazonlinux2-ansible:latest
+    privileged: yes
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:ro
+    command: /lib/systemd/systemd
+    pre_build_image: yes
   - name: debian9_systemd
     image: geerlingguy/docker-debian9-ansible:latest
     privileged: yes

tasks/main.yml

@@ -21,11 +21,12 @@
       paths:
         - "vars"
 
-- name: Install Xfce desktop environment and TigerVNC server
+- name: Install TigerVNC server
   package:
     name:
       "{{ package_names }}"
 
+# Does this go here?  Can this be generalized?
 - name: Disable screen locking
   file:
     path: /etc/xdg/autostart/light-locker.desktop
@@ -54,14 +55,6 @@
     group: "{{ username }}"
     mode: 0600
 
-- name: Deploy xstartup configuration file for VNC user
-  copy:
-    src: xstartup
-    dest: /home/{{ username }}/.vnc/
-    owner: "{{ username }}"
-    group: "{{ username }}"
-    mode: 0744
-
 - name: Set up VNC as a systemd service
   template:
     src: [email protected]
@@ -74,10 +67,9 @@
   when:
     - ansible_service_mgr == "systemd"
 
-- name: Start VNC systemd service and enable it to start on boot
+- name: Enable VNC systemd service
   systemd:
     name: "[email protected]"
-    state: started
     enabled: true
   when:
     - ansible_service_mgr == "systemd"

vars/Amazon.yml

@@ -0,0 +1,6 @@
+---
+# vars file for Amazon Linux
+
+# The TigerVNC package names
+package_names:
+  - tigervnc-server

vars/Debian.yml

@@ -1,9 +1,7 @@
 ---
 # vars file for Debian
 
-# The Xfce and TigerVNC package names
+# The TigerVNC package names
 package_names:
-  - xfce4
-  - xfce4-goodies
   - tigervnc-standalone-server
   - tigervnc-common

vars/RedHat.yml

@@ -1,7 +1,6 @@
 ---
 # vars file for RedHat
 
-# The Xfce and TigerVNC package names
+# The TigerVNC package names
 package_names:
-  - '@xfce-desktop-environment'
   - tigervnc-server