From 5caf38ddc52b1245c3445d9bcf0ba034fe321401 Mon Sep 17 00:00:00 2001
From: Mitra Ardron <mitra@mitra.biz>
Date: Wed, 24 Apr 2019 18:06:12 +1000
Subject: [PATCH] Give yarn its own role

---
 roles/internetarchive/meta/main.yml  |  1 +
 roles/internetarchive/tasks/main.yml | 24 ++++++----------------
 roles/yarn/tasks/tasks.yml           | 30 ++++++++++++++++++++++++++++
 3 files changed, 37 insertions(+), 18 deletions(-)
 create mode 100644 roles/yarn/tasks/tasks.yml

diff --git a/roles/internetarchive/meta/main.yml b/roles/internetarchive/meta/main.yml
index 8067bd42c..2245d5fa5 100644
--- a/roles/internetarchive/meta/main.yml
+++ b/roles/internetarchive/meta/main.yml
@@ -1,2 +1,3 @@
 dependencies:
     - { role: nodejs, tags: ['nodejs'], when: internetarchive_install }
+    - { role: yarn, tags: ['yarn'], when: internetarchive_install }
diff --git a/roles/internetarchive/tasks/main.yml b/roles/internetarchive/tasks/main.yml
index 0d3130644..5bb2469c3 100644
--- a/roles/internetarchive/tasks/main.yml
+++ b/roles/internetarchive/tasks/main.yml
@@ -12,24 +12,6 @@
          - cmake
       state: present
 
-- name: Setup for yarn install from its own repo 1/2
-  command: sh -c 'curl -sL https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add -'
-  args:
-    chdir: "{{ iiab_base }}"
-  when: internet_available
-
-- name: Setup for yarn install from its own repo 2/2
-  command: sh -c 'echo "deb https://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list'
-  args:
-    chdir: "{{ iiab_base }}"
-  when: internet_available
-
-- name: Install yarn
-  package:
-    name:
-      - yarn
-    state: present
-
 - name: Create directory {{ internetarchive_dir }}
   file:
     path: "{{ internetarchive_dir }}"
@@ -42,6 +24,12 @@
     chdir: "{{ internetarchive_dir }}"
   when: internet_available
 
+- name: Create directory /library/archiveorg
+  file:
+    path: "/library/archiveorg"
+    state: directory
+    owner: "root"
+
 # CONFIG FILES
 
 - name: "Install from templates: internetarchive.service (systemd), internetarchive.conf (Apache)"
diff --git a/roles/yarn/tasks/tasks.yml b/roles/yarn/tasks/tasks.yml
new file mode 100644
index 000000000..f9aea3379
--- /dev/null
+++ b/roles/yarn/tasks/tasks.yml
@@ -0,0 +1,30 @@
+---
+
+- name: "Yarn | GPG"
+  apt_key:
+    url: https://dl.yarnpkg.com/debian/pubkey.gpg
+    state: present
+
+- name: "Yarn | Ensure Debian sources list file exists"
+  file:
+    path: /etc/apt/sources.list.d/yarn.list
+    owner: root
+    mode: 0644
+    state: touch
+
+- name: "Yarn | Ensure Debian package is in sources list"
+  lineinfile:
+    dest: /etc/apt/sources.list.d/yarn.list
+    regexp: 'deb http://dl.yarnpkg.com/debian/ stable main'
+    line: 'deb http://dl.yarnpkg.com/debian/ stable main'
+    state: present
+
+- name: "Yarn | Update APT cache"
+  apt:
+    update_cache: yes
+
+- name: "Yarn | Uninstall"
+  package:
+    name: yarn
+    state: latest
+  when: internet_available and is_debuntu
\ No newline at end of file