From 023548029475f16f15fd5ca51542ebebbeab5e81 Mon Sep 17 00:00:00 2001
From: Chris Hines <chris.hines@monash.edu>
Date: Tue, 16 Aug 2016 14:26:41 +1000
Subject: [PATCH] make our centos7 instances start kde instead of mate'
Former-commit-id: 89304fe1aa43e0b5611238dd895efb418028a4c0
---
roles/vncserver/tasks/main.yml | 15 +--------------
roles/vncserver/templates/vncserver.centos | 2 +-
2 files changed, 2 insertions(+), 15 deletions(-)
diff --git a/roles/vncserver/tasks/main.yml b/roles/vncserver/tasks/main.yml
index e79ed591..c79336e6 100644
--- a/roles/vncserver/tasks/main.yml
+++ b/roles/vncserver/tasks/main.yml
@@ -1,5 +1,4 @@
---
-#- include_vars: "{{ hostvars[ansible_hostname]['ansible_distribution'] }}_{{ ansible_architecture }}.yml"
- include_vars: "{{ ansible_distribution }}_{{ ansible_architecture }}.yml"
- include_vars: "CentOS_7_x86_64.yml"
@@ -11,19 +10,7 @@
with_items: system_packages
when: ansible_os_family == 'Debian'
-- name: yum group installs
- shell: yum -y group install {{ item }}
- sudo: true
- with_items: system_group_packages
- when: system_group_packages is defined
-
-- name: install system packages yum
- yum: name={{ item }} state=present update_cache=yes
- sudo: true
- with_items: system_packages
- when: ansible_os_family == 'RedHat'
-
-- name: force the use of mate desktop
+- name: force the use of KDE desktop
template: src=vncserver.centos dest=/bin/vncserver
sudo: true
when: ansible_os_family == 'RedHat'
diff --git a/roles/vncserver/templates/vncserver.centos b/roles/vncserver/templates/vncserver.centos
index e8d71f85..78cad9c0 100755
--- a/roles/vncserver/templates/vncserver.centos
+++ b/roles/vncserver/templates/vncserver.centos
@@ -59,7 +59,7 @@ $defaultXStartup
= ("#!/bin/sh\n\n".
"unset SESSION_MANAGER\n".
"unset DBUS_SESSION_BUS_ADDRESS\n".
- "exec mate-session\n");
+ "exec startkde\n");
chop($host = `uname -n`);
--
GitLab