From 2c4d81ff762f080dca23349c8a5d77668616f6e0 Mon Sep 17 00:00:00 2001 From: George Hunt Date: Thu, 17 May 2018 22:23:44 +0000 Subject: [PATCH] got through runrole --- roles/sugarizer/defaults/main.yml | 1 + roles/sugarizer/tasks/main.yml | 31 +++++++++++++++++++++---- roles/sugarizer/templates/sugarizer.ini | 22 +++++++++++++++--- 3 files changed, 47 insertions(+), 7 deletions(-) diff --git a/roles/sugarizer/defaults/main.yml b/roles/sugarizer/defaults/main.yml index c792e0933..3ad4b80a8 100644 --- a/roles/sugarizer/defaults/main.yml +++ b/roles/sugarizer/defaults/main.yml @@ -2,4 +2,5 @@ sugarizer_install: True sugarizer_enabled: False sugarizer_location: '{{ doc_root }}' sugarizer_version: 'sugarizer-1.0' +sugarizer_server_version: 'sugarizer-server-1.0' npm_exists: False diff --git a/roles/sugarizer/tasks/main.yml b/roles/sugarizer/tasks/main.yml index 13c1f6c40..31c77535d 100644 --- a/roles/sugarizer/tasks/main.yml +++ b/roles/sugarizer/tasks/main.yml @@ -13,12 +13,35 @@ # command: tar xzf {{ downloads_dir }}/{{ sugarizer_version }}.tar.gz -C {{ sugarizer_location }} # creates="{{ sugarizer_location }}/{{ sugarizer_version }}/index.html" +- name: Download latest stable Server from location we control + get_url: + url: "{{ iiab_download_url }}/{{ sugarizer_server_version }}.tar.gz" + dest: "{{ downloads_dir }}/{{ sugarizer_server_version }}.tar.gz" + timeout: "{{ download_timeout }}" + when: internet_available + +- name: Untar to /library/www/html/{{ sugarizer_version }} + unarchive: + src: "{{ downloads_dir }}/{{ sugarizer_version }}.tar.gz" + dest: "{{ sugarizer_location }}" + creates: "{{ sugarizer_location }}/{{ sugarizer_version }}/index.html" - name: Create symbolic link /library/www/html/sugarizer file: src: "{{ sugarizer_location }}/{{ sugarizer_version }}" dest: "{{ sugarizer_location }}/sugarizer" state: link +- name: Untar to /library/www/html/{{ sugarizer_server_version }} + unarchive: + src: "{{ downloads_dir }}/{{ sugarizer_server_version }}.tar.gz" + dest: "{{ sugarizer_location }}" + creates: "{{ sugarizer_location }}/{{ sugarizer_server_version }}/index.html" +- name: Create symbolic link /library/www/html/sugarizer + file: + src: "{{ sugarizer_location }}/{{ sugarizer_server_version }}" + dest: "{{ sugarizer_location }}/sugarizer-server" + 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 and not is_ubuntu_18 @@ -52,7 +75,7 @@ # attempting to reinstall npm is broken on Raspbian 9 - name: Check for Sugarizer already installed stat: - path: "{{ sugarizer_location }}/sugarizer/server/node_modules" + path: "{{ sugarizer_location }}/{{ sugarizer_server_version }}/node_modules" register: npm ignore_errors: true @@ -70,7 +93,7 @@ mode: 0644 with_items: - { src: 'sugarizer.service.j2' , dest: '/etc/systemd/system/sugarizer.service'} - - { src: 'sugarizer.ini' , dest: '{{ sugarizer_location }}/sugarizer/server' } + - { src: 'sugarizer.ini' , dest: '{{ sugarizer_location }}/{{ sugarizer_server_version }}/env/sugarizer.ini' } # - { src: 'sugarizer.conf' , dest: '/etc/apache2/sites-available' } #- name: Create the symlink enabling the rewrite @@ -81,8 +104,8 @@ - name: Create the express framework for Node.js (OS's other than Fedora 18) shell: npm install args: - chdir: "{{ sugarizer_location }}/sugarizer/server" - creates: "{{ sugarizer_location }}/sugarizer/server/node_modules" + chdir: "{{ sugarizer_location }}/{{ sugarizer_server_version }}" + creates: "{{ sugarizer_location }}/{{ sugarizer_server_version }}/server/node_modules" when: not is_F18 and not npm_exists - name: Create the express framework for Node.js (Fedora 18) diff --git a/roles/sugarizer/templates/sugarizer.ini b/roles/sugarizer/templates/sugarizer.ini index 5ab515000..44024ee3b 100644 --- a/roles/sugarizer/templates/sugarizer.ini +++ b/roles/sugarizer/templates/sugarizer.ini @@ -1,8 +1,21 @@ -; Sugarizer configuration file +[information] +name = Sugarizer Server +description = Your Sugarizer Server [web] port = 8089 +[security] +min_password_size = 4 +max_age = 172800000 +https = false +certificate_file = ../server.crt +key_file = ../server.key +strict_ssl = false + +[client] +path = ../sugarizer/ + [database] server = localhost port = 27018 @@ -11,13 +24,16 @@ name = sugarizer [presence] port = 8039 +[statistics] +active = true + [collections] users = users journal = journal +stats = stats [activities] activities_directory_name = activities -activities_path = ../activities template_directory_name = ActivityTemplate activity_info_path = activity/activity.info -favorites = org.sugarlabs.GearsActivity,org.sugarlabs.MazeWebActivity,org.olpcfrance.PaintActivity,org.olpcfrance.TamTamMicro,org.olpcfrance.MemorizeActivity,org.olpg-france.physicsjs,org.sugarlabs.CalculateActivity,org.sugarlabs.TurtleBlocksJS,org.sugarlabs.Clock,,org.olpcfrance.RecordActivity,org.olpcfrance.Abecedarium,org.olpcfrance.KAView,org.olpcfrance.FoodChain,org.olpc-france.labyrinthjs,org.olpcfrance.TankOp,org.sugarlabs.ChatPrototype,org.olpcfrance.Gridpaint,org.olpc-france.LOLActivity,org.sugarlabs.StopwatchActivity,org.sugarlabs.GTDActivity,org.sugarlabs.Markdown,org.laptop.WelcomeWebActivity +favorites = org.sugarlabs.GearsActivity,org.sugarlabs.MazeWebActivity,org.olpcfrance.PaintActivity,org.olpcfrance.TamTamMicro,org.olpcfrance.MemorizeActivity,org.olpg-france.physicsjs,org.sugarlabs.CalculateActivity,org.sugarlabs.TurtleBlocksJS,org.sugarlabs.Clock,org.sugarlabs.SpeakActivity,org.sugarlabs.moon,org.olpcfrance.RecordActivity,org.olpcfrance.Abecedarium,org.olpcfrance.videoviewer,org.olpcfrance.FoodChain,org.olpc-france.labyrinthjs,org.olpcfrance.TankOp,org.sugarlabs.ChatPrototype,org.olpcfrance.Gridpaint,org.olpc-france.LOLActivity,org.olpcfrance.sharednotes,org.sugarlabs.ColorMyWorldActivity,com.homegrownapps.xoeditor,com.homegrownapps.reflection,com.homegrownapps.abacus,org.sugarlabs.Blockrain,org.sugarlabs.StopwatchActivity,com.homegrownapps.flip,org.somosazucar.JappyActivity,org.olpcfrance.qrcode,org.sugarlabs.Markdown,org.sugarlabs.gameOfLife,org.sugarlabs.Scratch,org.sugarlabs.FotoToonJs