From f1485451ef23c5c7aee17b54d6750c0e578149ca Mon Sep 17 00:00:00 2001 From: Eric Morino Date: Thu, 25 Aug 2022 17:35:10 +0200 Subject: [PATCH] =?UTF-8?q?rendu=20compatible=20le=20r=C3=B4le=20avec=20ap?= =?UTF-8?q?ache=20pour=20nextcloud01?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- webapps/nextcloud/handlers/main.yml | 5 +++ webapps/nextcloud/tasks/main.yml | 9 +++- webapps/nextcloud/tasks/vhost-apache.yml | 24 ++++++++++ .../tasks/{vhost.yml => vhost-nginx.yml} | 0 webapps/nextcloud/templates/apache.conf.j2 | 44 +++++++++++++++++++ 5 files changed, 81 insertions(+), 1 deletion(-) create mode 100644 webapps/nextcloud/tasks/vhost-apache.yml rename webapps/nextcloud/tasks/{vhost.yml => vhost-nginx.yml} (100%) create mode 100644 webapps/nextcloud/templates/apache.conf.j2 diff --git a/webapps/nextcloud/handlers/main.yml b/webapps/nextcloud/handlers/main.yml index 2db4770d..46b3b014 100644 --- a/webapps/nextcloud/handlers/main.yml +++ b/webapps/nextcloud/handlers/main.yml @@ -8,3 +8,8 @@ service: name: nginx state: reloaded + +- name: reload apache + service: + name: apache2 + state: reloaded \ No newline at end of file diff --git a/webapps/nextcloud/tasks/main.yml b/webapps/nextcloud/tasks/main.yml index a6d39b4b..7ce81693 100644 --- a/webapps/nextcloud/tasks/main.yml +++ b/webapps/nextcloud/tasks/main.yml @@ -45,7 +45,14 @@ - include: archive.yml -- include: vhost.yml +- name: Check if Apache or Nginx + service_facts: + +- include: vhost-nginx.yml + when: "'nginx.service' in services" + +- include: vhost-apache.yml + when: "'apache2.service' in services" - include: mysql.yml diff --git a/webapps/nextcloud/tasks/vhost-apache.yml b/webapps/nextcloud/tasks/vhost-apache.yml new file mode 100644 index 00000000..595c283b --- /dev/null +++ b/webapps/nextcloud/tasks/vhost-apache.yml @@ -0,0 +1,24 @@ +--- +- block: + - name: Copy Apache vhost + template: + src: apache.conf.j2 + dest: "/etc/apache2/sites-available/{{ nextcloud_instance_name }}.conf" + mode: "0640" + notify: reload apache + tags: + - nextcloud + + - name: Enable Apache vhost + file: + src: "/etc/apache2/sites-available/{{ nextcloud_instance_name }}.conf" + dest: "/etc/apache2/sites-enabled/{{ nextcloud_instance_name }}.conf" + state: link + notify: reload apache + tags: + - nextcloud + + # - name: Generate ssl config + # shell: + # cmd: "/usr/local/sbin/vhost-domains {{ nextcloud_instance_name }} | /usr/local/sbin/make-csr {{ nextcloud_instance_name }}" + # creates: "/etc/nginx/ssl/{{ nextcloud_instance_name }}.conf" \ No newline at end of file diff --git a/webapps/nextcloud/tasks/vhost.yml b/webapps/nextcloud/tasks/vhost-nginx.yml similarity index 100% rename from webapps/nextcloud/tasks/vhost.yml rename to webapps/nextcloud/tasks/vhost-nginx.yml diff --git a/webapps/nextcloud/templates/apache.conf.j2 b/webapps/nextcloud/templates/apache.conf.j2 new file mode 100644 index 00000000..bb41efab --- /dev/null +++ b/webapps/nextcloud/templates/apache.conf.j2 @@ -0,0 +1,44 @@ + + ServerName {{ nextcloud_domains | join(' ') }} + + DocumentRoot {{ nextcloud_webroot }}/ + + + Require all granted + AllowOverride All + Options FollowSymLinks MultiViews + + + Dav off + + + + # user - group (thanks to sesse@debian.org) + AssignUserID {{ nextcloud_instance_name }} {{ nextcloud_instance_name }} + + # LOG + CustomLog /var/log/apache2/access.log vhost_combined + CustomLog /home/{{ nextcloud_instance_name }}/log/access.log combined + ErrorLog /home/{{ nextcloud_instance_name }}/log/error.log + + # REWRITE + UseCanonicalName On + RewriteEngine On + RewriteCond %{HTTP_HOST} !^{{ nextcloud_domains | join(' ') }}$ + RewriteRule ^/(.*) http://%{SERVER_NAME}/$1 [L,R] + + # PHP + #php_admin_flag engine off + #AddType text/html .html + #php_admin_flag display_errors On + #php_flag short_open_tag On + #php_flag register_globals On + #php_admin_value memory_limit 256M + #php_admin_value max_execution_time 60 + #php_admin_value upload_max_filesize 8M + #php_admin_flag allow_url_fopen Off + #php_value default_charset ISO-8859-15 + php_admin_value sendmail_path "/usr/sbin/sendmail -t -i -f {{ nextcloud_instance_name }}" + php_admin_value open_basedir "/usr/share/php:/home/{{ nextcloud_instance_name }}:/tmp" + + \ No newline at end of file