airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From machris...@apache.org
Subject [airavata] 01/04: AIRAVATA-2382 Moving max upload filesize to vhost config
Date Sun, 22 Jul 2018 16:49:35 GMT
This is an automated email from the ASF dual-hosted git repository.

machristie pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata.git

commit d679f53d2dd5ca709a13dcc601e1d5e76892ce7a
Author: Marcus Christie <machrist@iu.edu>
AuthorDate: Sun Jul 22 12:20:29 2018 -0400

    AIRAVATA-2382 Moving max upload filesize to vhost config
---
 dev-tools/ansible/roles/pga/defaults/main.yml               | 4 ++++
 dev-tools/ansible/roles/pga/templates/pga-ssl-vhost.conf.j2 | 2 ++
 dev-tools/ansible/roles/pga/templates/pga-vhost.conf.j2     | 2 ++
 3 files changed, 8 insertions(+)

diff --git a/dev-tools/ansible/roles/pga/defaults/main.yml b/dev-tools/ansible/roles/pga/defaults/main.yml
index bbd0b5c..b49fdd1 100644
--- a/dev-tools/ansible/roles/pga/defaults/main.yml
+++ b/dev-tools/ansible/roles/pga/defaults/main.yml
@@ -42,6 +42,10 @@ httpd_log_dir:
  Debian: /var/log/apache2
  RedHat: /var/log/httpd
 
+# PHP Config values set in httpd vhost config
+php_upload_max_filesize: "64M"
+php_post_max_size: "64M"
+
 pga_vhost_template: "pga-vhost.conf.j2"
 pga_ssl_vhost_template: "pga-ssl-vhost.conf.j2"
 pga_config_template: "pga_config.php.j2"
diff --git a/dev-tools/ansible/roles/pga/templates/pga-ssl-vhost.conf.j2 b/dev-tools/ansible/roles/pga/templates/pga-ssl-vhost.conf.j2
index cf58076..7d0ba1a 100644
--- a/dev-tools/ansible/roles/pga/templates/pga-ssl-vhost.conf.j2
+++ b/dev-tools/ansible/roles/pga/templates/pga-ssl-vhost.conf.j2
@@ -26,6 +26,8 @@
     DocumentRoot {{ doc_root_dir }}/public
     <Directory "{{ doc_root_dir }}/public">
        AllowOverride All
+       php_value upload_max_filesize {{ php_upload_max_filesize }}
+       php_value post_max_size {{ php_post_max_size }}
     </Directory>
     ErrorLog {{ httpd_log_dir[ansible_os_family] }}/{{ gateway_id }}.error.log
     CustomLog {{ httpd_log_dir[ansible_os_family] }}/{{ gateway_id }}.requests.log combined
diff --git a/dev-tools/ansible/roles/pga/templates/pga-vhost.conf.j2 b/dev-tools/ansible/roles/pga/templates/pga-vhost.conf.j2
index dd4a07a..f625467 100644
--- a/dev-tools/ansible/roles/pga/templates/pga-vhost.conf.j2
+++ b/dev-tools/ansible/roles/pga/templates/pga-vhost.conf.j2
@@ -14,6 +14,8 @@
     DocumentRoot {{ doc_root_dir }}/public
     <Directory "{{ doc_root_dir }}/public">
        AllowOverride All
+       php_value upload_max_filesize {{ php_upload_max_filesize }}
+       php_value post_max_size {{ php_post_max_size }}
     </Directory>
     ErrorLog {{ httpd_log_dir[ansible_os_family] }}/{{ gateway_id }}.error.log
     CustomLog {{ httpd_log_dir[ansible_os_family] }}/{{ gateway_id }}.requests.log combined


Mime
View raw message