lxc-php & webapps/evoadmin-web: Commit missing fixes
This commit is contained in:
parent
84ec361270
commit
8bc4ff4ada
|
@ -17,7 +17,7 @@ galaxy_info:
|
||||||
allow_duplicates: yes
|
allow_duplicates: yes
|
||||||
|
|
||||||
dependencies:
|
dependencies:
|
||||||
- { role: lxc,
|
- { role: evolix/lxc,
|
||||||
lxc_containers: [ { name: "{{ lxc_php_version }}", release: "{{ lxc_php_container_releases[lxc_php_version] }}" } ],
|
lxc_containers: [ { name: "{{ lxc_php_version }}", release: "{{ lxc_php_container_releases[lxc_php_version] }}" } ],
|
||||||
when: lxc_php_version is defined
|
when: lxc_php_version is defined
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,14 +1,8 @@
|
||||||
---
|
---
|
||||||
<<<<<<< HEAD
|
|
||||||
- name: LXC configuration
|
|
||||||
include_role:
|
|
||||||
name: evolix/lxc
|
|
||||||
=======
|
|
||||||
- name: "Ensure that lxc_php_version is defined"
|
- name: "Ensure that lxc_php_version is defined"
|
||||||
fail:
|
fail:
|
||||||
msg: Please configure var lxc_php_version
|
msg: Please configure var lxc_php_version
|
||||||
when: lxc_php_version is none
|
when: lxc_php_version is none
|
||||||
>>>>>>> lxc-php: An almost complete rewrite ** BREAKING **
|
|
||||||
|
|
||||||
- name: "Update APT cache in container {{lxc_php_version}}"
|
- name: "Update APT cache in container {{lxc_php_version}}"
|
||||||
lxc_container:
|
lxc_container:
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
- name: "{{ lxc_php_version }} - Install PHP packages"
|
- name: "{{ lxc_php_version }} - Install PHP packages"
|
||||||
lxc_container:
|
lxc_container:
|
||||||
name: "{{ lxc_php_version }}"
|
name: "{{ lxc_php_version }}"
|
||||||
container_command: "DEBIAN_FRONTEND=noninteractive apt install -y php5-fpm php5-cli php5-gd php5-imap php5-ldap php5-mcrypt php5-mysql php5-pgsql php-gettext php5-intl php5-curl php5-ssh2 php5-zip php5-mbstring libphp-phpmailer opensmtpd git zip unzip"
|
container_command: "DEBIAN_FRONTEND=noninteractive apt install -y php5-fpm php5-cli php5-gd php5-imap php5-ldap php5-mcrypt php5-mysql php5-pgsql php-gettext php5-intl php5-curl php5-ssh2 libphp-phpmailer ssmtp git zip unzip"
|
||||||
|
|
||||||
- name: "{{ lxc_php_version }} - Copy evolinux PHP configuration"
|
- name: "{{ lxc_php_version }} - Copy evolinux PHP configuration"
|
||||||
template:
|
template:
|
||||||
|
|
|
@ -35,4 +35,4 @@
|
||||||
src: phpContainer
|
src: phpContainer
|
||||||
dest: /usr/local/bin/phpContainer
|
dest: /usr/local/bin/phpContainer
|
||||||
mode: 0700
|
mode: 0700
|
||||||
when: evoadmin_multi_php
|
when: packweb_multiphp_versions is defined
|
||||||
|
|
|
@ -121,4 +121,4 @@
|
||||||
lineinfile:
|
lineinfile:
|
||||||
dest: /etc/skel/.bashrc
|
dest: /etc/skel/.bashrc
|
||||||
line: "alias php='sudo /usr/local/bin/phpContainer'"
|
line: "alias php='sudo /usr/local/bin/phpContainer'"
|
||||||
when: evoadmin_multi_php
|
when: packweb_multiphp_versions is defined
|
||||||
|
|
|
@ -90,4 +90,4 @@
|
||||||
state: present
|
state: present
|
||||||
name: proxy_fcgi
|
name: proxy_fcgi
|
||||||
notify: restart apache2
|
notify: restart apache2
|
||||||
when: evoadmin_multi_php
|
when: packweb_multiphp_versions is defined
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
User_Alias EVOADMIN = www-evoadmin
|
User_Alias EVOADMIN = www-evoadmin
|
||||||
Cmnd_Alias EVOADMIN_WEB = {{ evoadmin_scripts_dir | mandatory }}/web-*.sh, {{ evoadmin_scripts_dir | mandatory }}/ftpadmin.sh, {{ evoadmin_scripts_dir | mandatory }}/dbadmin.sh
|
Cmnd_Alias EVOADMIN_WEB = {{ evoadmin_scripts_dir | mandatory }}/web-*.sh, {{ evoadmin_scripts_dir | mandatory }}/ftpadmin.sh, {{ evoadmin_scripts_dir | mandatory }}/dbadmin.sh
|
||||||
EVOADMIN ALL=NOPASSWD: EVOADMIN_WEB
|
EVOADMIN ALL=NOPASSWD: EVOADMIN_WEB
|
||||||
{% if evoadmin_multi_php %}
|
{% if packweb_multiphp_versions is defined %}
|
||||||
Defaults env_keep += "LOGNAME PWD"
|
Defaults env_keep += "LOGNAME PWD"
|
||||||
ALL ALL = NOPASSWD: /usr/local/bin/phpContainer
|
ALL ALL = NOPASSWD: /usr/local/bin/phpContainer
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
Loading…
Reference in a new issue