diff --git a/roles/configure-interfaces/tasks/main.yml b/roles/configure-interfaces/tasks/main.yml
index afa3a62..6567da1 100644
--- a/roles/configure-interfaces/tasks/main.yml
+++ b/roles/configure-interfaces/tasks/main.yml
@@ -10,8 +10,10 @@
template: src=../roles/configure-interfaces/templates/eth.cfg.j2 dest=/etc/network/interfaces.d/{{ interface_name }}.cfg
- name: Up down interface
- shell: ifdown {{ interface_name }} && ifup {{ interface_name }}
- async: 0
+ # shell: bash -c "(ifdown {{ interface_name }} && ifup {{ interface_name }}) &"
+ shell: "(sleep 1; ifdown {{ interface_name }} && ifup {{ interface_name }}) &"
+ #shell: "ifdown --exclude=lo -a; sleep 1; ifup --exclude=lo -a"
+ async: 100
poll: 0
ignore_errors: true
vars:
diff --git a/roles/configure-interfaces/templates/eth.cfg.j2 b/roles/configure-interfaces/templates/eth.cfg.j2
index 69b0687..a5fa54d 100644
--- a/roles/configure-interfaces/templates/eth.cfg.j2
+++ b/roles/configure-interfaces/templates/eth.cfg.j2
@@ -4,4 +4,4 @@ iface {{ interface_name }} inet static
address {{ ansible_host }}
netmask 255.255.255.0
gateway 10.0.0.1
-dns-nameservers {{ dns_server }} 8.8.8.8
+dns-nameservers {{ dns_server }} 1.1.1.1
diff --git a/roles/developer-machine/tasks/main.yml b/roles/developer-machine/tasks/main.yml
index a751812..4a8410c 100644
--- a/roles/developer-machine/tasks/main.yml
+++ b/roles/developer-machine/tasks/main.yml
@@ -124,8 +124,13 @@
- name: Set xrdp session
command: echo "xfce4-session" > /home/{{ standard_user }}/.xsession
-- name: Fix tabbing in xrdp
- lineinfile: dest=/home/{{ standard_user }}/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml
- regexp=name="<Super>Tab"
- state=present
- line=
+- name: Set up xrdp.ini
+ template: src=../roles/developer-machine/templates/xrdp.ini.j2 dest=/etc/xrdp/xrdp.ini
+
+- name: Fix xrdp tabbing
+ template: src=../roles/developer-machine/templates/xfce4-keyboard-shortcuts.xml.j2 dest=/home/{{ standard_user }}/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml
+ become: yes
+ become_user: "{{ standard_user }}"
+
+- name: Restart xrdp
+ shell: service xrdp restart
\ No newline at end of file
diff --git a/roles/developer-machine/templates/xfce4-keyboard-shortcuts.xml.j2 b/roles/developer-machine/templates/xfce4-keyboard-shortcuts.xml.j2
new file mode 100644
index 0000000..6e98761
--- /dev/null
+++ b/roles/developer-machine/templates/xfce4-keyboard-shortcuts.xml.j2
@@ -0,0 +1,149 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/roles/developer-machine/templates/xrdp.ini.j2 b/roles/developer-machine/templates/xrdp.ini.j2
new file mode 100644
index 0000000..dce3ed6
--- /dev/null
+++ b/roles/developer-machine/templates/xrdp.ini.j2
@@ -0,0 +1,32 @@
+[globals]
+bitmap_cache=yes
+bitmap_compression=yes
+port=3389
+crypt_level=low
+channel_code=1
+max_bpp=24
+#black=000000
+#grey=d6d3ce
+#dark_grey=808080
+#blue=08246b
+#dark_blue=08246b
+#white=ffffff
+#red=ff0000
+#green=00ff00
+#background=626c72
+
+[xrdp1]
+name=Vnc Reconnect
+lib=libvnc.so
+username=ask
+password=ask
+ip=127.0.0.1
+port=5910
+
+[xrdp2]
+name=Vnc New
+lib=libvnc.so
+ip=127.0.0.1
+port=-1
+username=ask
+password=ask