From 1e71c33b592bb4a9ea8b3177dd886f3193670d5b Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 19 Nov 2017 22:56:53 -0500 Subject: [PATCH 1/6] manual lint'ing per Ansible recommendations --- roles/sugarizer/tasks/main.yml | 83 +++++++++++++++++++--------------- 1 file changed, 47 insertions(+), 36 deletions(-) diff --git a/roles/sugarizer/tasks/main.yml b/roles/sugarizer/tasks/main.yml index 8e935e275..9b0e9fe51 100644 --- a/roles/sugarizer/tasks/main.yml +++ b/roles/sugarizer/tasks/main.yml @@ -1,31 +1,38 @@ - name: Download the latest stable version of Sugarizer from location under our control - get_url: url={{ iiab_download_url }}/{{ sugarizer_version }}.tar.gz - dest={{ downloads_dir }}/{{ sugarizer_version }}.tar.gz + get_url: + url: "{{ iiab_download_url }}/{{ sugarizer_version }}.tar.gz" + dest: "{{ downloads_dir }}/{{ sugarizer_version }}.tar.gz" -#fixme - name: Untar it to target location - command: tar xzf {{ downloads_dir }}/{{ sugarizer_version }}.tar.gz -C {{ sugarizer_location }} - creates="{{ sugarizer_location }}/{{ sugarizer_version }}/index.html" + unarchive: + src: "{{ downloads_dir }}/{{ sugarizer_version }}.tar.gz" + dest: {{ sugarizer_location }} + creates: "{{ sugarizer_location }}/{{ sugarizer_version }}/index.html" +# command: tar xzf {{ downloads_dir }}/{{ sugarizer_version }}.tar.gz -C {{ sugarizer_location }} +# creates="{{ sugarizer_location }}/{{ sugarizer_version }}/index.html" - name: Create a symbolic link from generic url to version specific location - file: dest={{ sugarizer_location }}/sugarizer - src={{ sugarizer_location }}/{{ sugarizer_version }} - state=link + file: + src: "{{ sugarizer_location }}/{{ sugarizer_version }}" + dest: "{{ sugarizer_location }}/sugarizer" + state=link - name: Set up Node.js 6.x apt sources (debuntu) shell: curl -sL https://deb.nodesource.com/setup_6.x | bash - when: internet_available and is_debuntu - name: Install latest Node.js which includes /usr/bin/npm (debuntu) - package: name=nodejs - state=latest + package: + name: nodejs + state: latest # package: name=nodejs=6.* # state=present when: internet_available and is_debuntu - name: Install npm (OS's other than debuntu) - package: name={{ item }} - state=present + package: + name: "{{ item }}" + state: present when: internet_available and not is_debuntu with_items: - nodejs @@ -42,11 +49,12 @@ when: npm.stat.exists is defined and npm.stat.exists - name: Create systemd files and copy our ini file - template: src={{ item.src }} - dest={{ item.dest }} - owner=root - group=root - mode=0644 + template: + src: "{{ item.src }}" + dest: "{{ item.dest }}" + owner: root + group: root + mode: 0644 with_items: - { src: 'sugarizer.service.j2' , dest: '/etc/systemd/system/sugarizer.service'} - { src: 'sugarizer.ini' , dest: '{{ sugarizer_location }}/sugarizer/server' } @@ -58,43 +66,46 @@ # state=link - name: Create the express framework for Node.js (OS's other than Fedora 18) - shell: npm install + shell: npm install args: chdir: "{{ sugarizer_location }}/sugarizer/server" creates: "{{ sugarizer_location }}/sugarizer/server/node_modules" when: not is_F18 and not npm_exists - name: Create the express framework for Node.js (Fedora 18) - shell: npm install + shell: npm install args: chdir: "{{ sugarizer_location }}/sugarizer/server" when: is_F18 and not npm_exists - name: Enable services (all OS's) - service: name={{ item.name }} - enabled=yes - state=restarted + service: + name: "{{ item.name }}" + enabled: yes + state: restarted with_items: - { name: sugarizer } when: sugarizer_enabled - name: Disable services (all OS's) - service: name={{ item.name }} - enabled=no - state=stopped + service: + name: "{{ item.name }}" + enabled: no + state: stopped with_items: - - { name: sugarizer } + - { name: sugarizer } when: not sugarizer_enabled - name: Add 'sugarizer' to service list - ini_file: dest='{{ service_filelist }}' - section=sugarizer - option='{{ item.option }}' - value='"{{ item.value }}"' + ini_file: + dest="{{ service_filelist }}" + section=sugarizer + option="{{ item.option }}" + value="{{ item.value }}" with_items: - - option: name - value: Sugarizer - - option: description - value: '"The Sugar Learning Platform began with the famous One Laptop Per Child project, written in Python. Sugarizer is the new HTML/JavaScript implementation of Sugar, usable in most all browsers."' - - option: enabled - value: "{{ sugarizer_enabled }}" + - option: name + value: Sugarizer + - option: description + value: '"The Sugar Learning Platform began with the famous One Laptop Per Child project, written in Python. Sugarizer is the new HTML/JavaScript implementation of Sugar, usable in most all browsers."' + - option: enabled + value: "{{ sugarizer_enabled }}" From a0f9b922bc73e9a68c214f72691b08a51f72e84a Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 19 Nov 2017 23:02:07 -0500 Subject: [PATCH 2/6] Update main.yml --- roles/sugarizer/tasks/main.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/roles/sugarizer/tasks/main.yml b/roles/sugarizer/tasks/main.yml index 9b0e9fe51..88c95bd2f 100644 --- a/roles/sugarizer/tasks/main.yml +++ b/roles/sugarizer/tasks/main.yml @@ -98,10 +98,10 @@ - name: Add 'sugarizer' to service list ini_file: - dest="{{ service_filelist }}" - section=sugarizer - option="{{ item.option }}" - value="{{ item.value }}" + dest: "{{ service_filelist }}" + section: sugarizer + option: "{{ item.option }}" + value: "{{ item.value }}" with_items: - option: name value: Sugarizer From 4becca66dd27a6b5e85244a3c7a391b8e6002164 Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 19 Nov 2017 23:05:24 -0500 Subject: [PATCH 3/6] Update main.yml --- roles/sugarizer/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/sugarizer/tasks/main.yml b/roles/sugarizer/tasks/main.yml index 88c95bd2f..f0d7a15ae 100644 --- a/roles/sugarizer/tasks/main.yml +++ b/roles/sugarizer/tasks/main.yml @@ -6,7 +6,7 @@ - name: Untar it to target location unarchive: src: "{{ downloads_dir }}/{{ sugarizer_version }}.tar.gz" - dest: {{ sugarizer_location }} + dest: "{{ sugarizer_location }}" creates: "{{ sugarizer_location }}/{{ sugarizer_version }}/index.html" # command: tar xzf {{ downloads_dir }}/{{ sugarizer_version }}.tar.gz -C {{ sugarizer_location }} # creates="{{ sugarizer_location }}/{{ sugarizer_version }}/index.html" From ab36c02a4738c637054a2bdb1a8a0ad3fcef7875 Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 19 Nov 2017 23:09:54 -0500 Subject: [PATCH 4/6] Update main.yml --- roles/sugarizer/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/sugarizer/tasks/main.yml b/roles/sugarizer/tasks/main.yml index f0d7a15ae..8bc995b12 100644 --- a/roles/sugarizer/tasks/main.yml +++ b/roles/sugarizer/tasks/main.yml @@ -15,7 +15,7 @@ file: src: "{{ sugarizer_location }}/{{ sugarizer_version }}" dest: "{{ sugarizer_location }}/sugarizer" - state=link + state: link - name: Set up Node.js 6.x apt sources (debuntu) shell: curl -sL https://deb.nodesource.com/setup_6.x | bash - From 6b2492f84ffa6d577ddf9fa0643f7f77edcbe94a Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 19 Nov 2017 23:20:39 -0500 Subject: [PATCH 5/6] Ansible output more understandable --- roles/sugarizer/tasks/main.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/roles/sugarizer/tasks/main.yml b/roles/sugarizer/tasks/main.yml index 8bc995b12..8c9cfd033 100644 --- a/roles/sugarizer/tasks/main.yml +++ b/roles/sugarizer/tasks/main.yml @@ -1,9 +1,9 @@ -- name: Download the latest stable version of Sugarizer from location under our control +- name: Download latest stable Sugarizer from location under our control get_url: url: "{{ iiab_download_url }}/{{ sugarizer_version }}.tar.gz" dest: "{{ downloads_dir }}/{{ sugarizer_version }}.tar.gz" -- name: Untar it to target location +- name: Untar to /library/www/html/{{ sugarizer_version }} unarchive: src: "{{ downloads_dir }}/{{ sugarizer_version }}.tar.gz" dest: "{{ sugarizer_location }}" @@ -11,7 +11,7 @@ # command: tar xzf {{ downloads_dir }}/{{ sugarizer_version }}.tar.gz -C {{ sugarizer_location }} # creates="{{ sugarizer_location }}/{{ sugarizer_version }}/index.html" -- name: Create a symbolic link from generic url to version specific location +- name: Create symbolic link /library/www/html/sugarizer file: src: "{{ sugarizer_location }}/{{ sugarizer_version }}" dest: "{{ sugarizer_location }}/sugarizer" @@ -96,7 +96,7 @@ - { name: sugarizer } when: not sugarizer_enabled -- name: Add 'sugarizer' to service list +- name: Add 'sugarizer' to service list in /etc/iiab/iiab.ini ini_file: dest: "{{ service_filelist }}" section: sugarizer From a3c072e1f4ccc85a755dbadf92736cd0c1a3bde7 Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 19 Nov 2017 23:25:54 -0500 Subject: [PATCH 6/6] Update main.yml --- roles/sugarizer/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/sugarizer/tasks/main.yml b/roles/sugarizer/tasks/main.yml index 8c9cfd033..691975f60 100644 --- a/roles/sugarizer/tasks/main.yml +++ b/roles/sugarizer/tasks/main.yml @@ -1,4 +1,4 @@ -- name: Download latest stable Sugarizer from location under our control +- name: Download latest stable Sugarizer from location we control get_url: url: "{{ iiab_download_url }}/{{ sugarizer_version }}.tar.gz" dest: "{{ downloads_dir }}/{{ sugarizer_version }}.tar.gz"