diff --git a/packweb-apache/meta/main.yml b/packweb-apache/meta/main.yml index 1b34e540..c86b3a03 100644 --- a/packweb-apache/meta/main.yml +++ b/packweb-apache/meta/main.yml @@ -21,3 +21,4 @@ dependencies: - { role: squid, squid_localproxy_enable: True } - { role: mysql, when: packweb_mysql_variant == "debian" } - { role: mysql-oracle, when: packweb_mysql_variant == "oracle" } + - { role: webapps/evoadmin-web, evoadmin_enable_vhost: "{{ packweb_enable_evoadmin_vhost }}" } diff --git a/packweb-apache/tasks/main.yml b/packweb-apache/tasks/main.yml index 12e4a0df..0bac872e 100644 --- a/packweb-apache/tasks/main.yml +++ b/packweb-apache/tasks/main.yml @@ -65,10 +65,3 @@ - include: fhs_retrictions.yml when: packweb_fhs_retrictions - -- name: Install Evoadmin - include_role: - name: webapps/evoadmin-web - vars: - evoadmin_enable_vhost: "{{ packweb_enable_evoadmin_vhost }}" - diff --git a/webapps/evoadmin-web/tasks/user.yml b/webapps/evoadmin-web/tasks/user.yml index 5e8f6778..39926c0c 100644 --- a/webapps/evoadmin-web/tasks/user.yml +++ b/webapps/evoadmin-web/tasks/user.yml @@ -52,6 +52,13 @@ group: "{{ evoadmin_username }}" recurse: yes +- name: Create evoadmin log directory + file: + name: "{{ evoadmin_log_dir }}" + owner: "{{ evoadmin_username }}" + group: "{{ evoadmin_username }}" + state: directory + - include_role: name: remount-usr when: evoadmin_scripts_dir | search ("/usr")