mirror of
https://github.com/iiab/iiab.git
synced 2025-03-09 15:40:17 +00:00
Merge pull request #762 from jvonau/ubuntu-changes
ubuntu-changes: Nextcloud & Sugarizer tweaks for Ubuntu 18.04
This commit is contained in:
commit
61c2af407f
3 changed files with 18 additions and 4 deletions
|
@ -144,7 +144,7 @@
|
|||
mysql_service: mysqld
|
||||
no_NM_reload: 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)
|
||||
set_fact:
|
||||
|
|
|
@ -56,9 +56,14 @@
|
|||
- "php{{ php_version }}-mysql"
|
||||
- "php{{ php_version }}-curl"
|
||||
- "php{{ php_version }}-intl"
|
||||
- "php{{ php_version }}-mcrypt"
|
||||
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
|
||||
# but we only need to do this the first time
|
||||
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
|
||||
- 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
|
||||
when: internet_available and is_debuntu and not ubuntu-18
|
||||
|
||||
- name: Install latest Node.js which includes /usr/bin/npm (debuntu)
|
||||
package:
|
||||
|
@ -29,7 +29,7 @@
|
|||
state: latest
|
||||
# package: name=nodejs=6.*
|
||||
# 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)
|
||||
package:
|
||||
|
@ -40,6 +40,15 @@
|
|||
- nodejs
|
||||
- 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
|
||||
- name: Check for Sugarizer already installed
|
||||
stat:
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue