external/iiab
1
0
Fork 0
mirror of https://github.com/iiab/iiab.git synced 2025-03-09 15:40:17 +00:00
Code Issues Releases Wiki Activity

Merge pull request #762 from jvonau/ubuntu-changes

Browse source 
ubuntu-changes: Nextcloud & Sugarizer tweaks for Ubuntu 18.04
This commit is contained in:
A Holt 2018-04-30 10:25:39 -04:00 • committed by GitHub
commit 61c2af407f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
roles/0-init/tasks/main.yml
View file

@ -144,7 +144,7 @@
mysql_service: mysqld mysql_service: mysqld
no_NM_reload: True no_NM_reload: True
is_F18: True is_F18: True
when: ansible_distribution_release == "based on Fedora 18" or ansible_distribution_version == "18" when: (ansible_distribution_release == "based on Fedora 18" or ansible_distribution_version == "18") and ansible_distribution == "Fedora"
- name: Set mysql_service to mysql (debuntu) - name: Set mysql_service to mysql (debuntu)
set_fact: set_fact:

7
roles/nextcloud/tasks/main.yml
View file

@ -56,9 +56,14 @@
- "php{{ php_version }}-mysql" - "php{{ php_version }}-mysql"
- "php{{ php_version }}-curl" - "php{{ php_version }}-curl"
- "php{{ php_version }}-intl" - "php{{ php_version }}-intl"
- "php{{ php_version }}-mcrypt"
when: is_debuntu when: is_debuntu
- name: In php7.2, php dropped mcrypt
package:
name: "php{{ php_version }}-mcrypt"
state: present
when: is_debuntu and not is_ubuntu_18
# we need to install the rpm in order to get the dependencies # we need to install the rpm in order to get the dependencies
# but we only need to do this the first time # but we only need to do this the first time

13
roles/sugarizer/tasks/main.yml
View file

@ -21,7 +21,7 @@
- name: Set up Node.js 6.x apt sources (debuntu) - name: Set up Node.js 6.x apt sources (debuntu)
shell: curl -sL https://deb.nodesource.com/setup_6.x | bash - shell: curl -sL https://deb.nodesource.com/setup_6.x | bash -
when: internet_available and is_debuntu when: internet_available and is_debuntu and not ubuntu-18
- name: Install latest Node.js which includes /usr/bin/npm (debuntu) - name: Install latest Node.js which includes /usr/bin/npm (debuntu)
package: package:
@ -29,7 +29,7 @@
state: latest state: latest
# package: name=nodejs=6.* # package: name=nodejs=6.*
# state=present # state=present
when: internet_available and is_debuntu when: internet_available and is_debuntu and not ubuntu-18
- name: Install npm (OS's other than debuntu) - name: Install npm (OS's other than debuntu)
package: package:
@ -40,6 +40,15 @@
- nodejs - nodejs
- npm - npm
- name: Install npm (ubuntu-18)
package:
name: "{{ item }}"
state: latest
when: internet_available and is_ubuntu_18
with_items:
- npm
- nodejs
# attempting to reinstall npm is broken on Raspbian 9 # attempting to reinstall npm is broken on Raspbian 9
- name: Check for Sugarizer already installed - name: Check for Sugarizer already installed
stat: stat: