From 20dd6affb2f4ea3570fe0d96fe758a96936906c9 Mon Sep 17 00:00:00 2001
From: Jacob Cody Wimer <jacob.wimer@gmail.com>
Date: Sun, 7 Apr 2019 22:15:30 -0400
Subject: [PATCH] Remove xrdp, fix ngrok, and fix rvm

---
 roles/developer-machine/tasks/main.yml | 43 ++++++++++++--------------
 1 file changed, 20 insertions(+), 23 deletions(-)

diff --git a/roles/developer-machine/tasks/main.yml b/roles/developer-machine/tasks/main.yml
index 13be56f..19b82ca 100644
--- a/roles/developer-machine/tasks/main.yml
+++ b/roles/developer-machine/tasks/main.yml
@@ -6,13 +6,13 @@
   register: rvm_installed
 
 - name: Install rvm key
-  shell: gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3
+  shell: gpg --keyserver hkp://pool.sks-keyservers.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB
   when: not rvm_installed.stat.exists
   become: true
   become_user: "{{ standard_user }}"
 
 - name: Install rvm and latest ruby
-  shell: \curl -sSL https://get.rvm.io | bash -s stable
+  shell: \curl -sSL https://get.rvm.io | bash -s stable --ruby
   when: not rvm_installed.stat.exists
   become: true
   become_user: "{{ standard_user }}"
@@ -54,7 +54,7 @@
 - name: Install other apt items
   apt: name={{ item }} state=present
   with_items:
-    - xrdp
+    #- xrdp
     - tmate
     - xubuntu-desktop
 
@@ -76,9 +76,7 @@
 - name: Install pathogen
   become: yes
   become_user: "{{ standard_user }}"
-  git:
-    repo: https://github.com/tpope/vim-pathogen.git
-    dest: /home/{{ standard_user }}/.vim/autoload/pathogen.vim
+  shell: curl -LSso /home/{{ standard_user }}/.vim/autoload/pathogen.vim https://tpo.pe/pathogen.vim
   ignore_errors: yes
 
 - name: Install nerdtree vim plugin
@@ -140,23 +138,22 @@
   
 - name: Install ngrok
   shell: npm install -g ngrok
-  # npm:
-  #   name: ngrok
-  #   global: true
-  environment:
-    PATH: "/home/{{ standard_user }}/.nvm/versions/node/v{{ node_version }}/bin:{{ ansible_env.PATH }}"
-  ignore_errors: yes
-
-- name: Set xrdp session
-  command: echo "xfce4-session" > /home/{{ standard_user }}/.xsession
-
-- 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 }}"
+  ignore_errors: yes
+  environment:
+    PATH: "/home/{{ standard_user }}/.nvm/versions/node/v{{ node_version }}/bin:{{ ansible_env.PATH }}"
 
-- name: Restart xrdp
-  shell: service xrdp restart
+#- name: Set xrdp session
+#  command: echo "xfce4-session" > /home/{{ standard_user }}/.xsession
+
+#- 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