You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ma...@apache.org on 2018/12/20 13:54:24 UTC
[airavata] branch staging updated (a6ef239 -> abd1979)
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a change to branch staging
in repository https://gitbox.apache.org/repos/asf/airavata.git.
from a6ef239 Validating jobs for process
new b827146 AIRAVATA-2382 Moving max upload filesize to vhost config
new abd1979 AIRAVATA-2382 Adding comments
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
dev-tools/ansible/roles/pga/defaults/main.yml | 7 +++++++
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, 11 insertions(+)
[airavata] 01/02: AIRAVATA-2382 Moving max upload filesize to vhost
config
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch staging
in repository https://gitbox.apache.org/repos/asf/airavata.git
commit b82714626017773aef293db1bbd0f44763c0e869
Author: Marcus Christie <ma...@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 44ec48b..27b0b33 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
@@ -19,6 +19,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 48576b6..3433e56 100644
--- a/dev-tools/ansible/roles/pga/templates/pga-vhost.conf.j2
+++ b/dev-tools/ansible/roles/pga/templates/pga-vhost.conf.j2
@@ -7,6 +7,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
[airavata] 02/02: AIRAVATA-2382 Adding comments
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch staging
in repository https://gitbox.apache.org/repos/asf/airavata.git
commit abd1979dcc01f68f1f29c4ae894e9939d2decc8f
Author: Marcus Christie <ma...@iu.edu>
AuthorDate: Sun Jul 22 12:46:34 2018 -0400
AIRAVATA-2382 Adding comments
---
dev-tools/ansible/roles/pga/defaults/main.yml | 3 +++
1 file changed, 3 insertions(+)
diff --git a/dev-tools/ansible/roles/pga/defaults/main.yml b/dev-tools/ansible/roles/pga/defaults/main.yml
index b49fdd1..12317a4 100644
--- a/dev-tools/ansible/roles/pga/defaults/main.yml
+++ b/dev-tools/ansible/roles/pga/defaults/main.yml
@@ -43,6 +43,9 @@ httpd_log_dir:
RedHat: /var/log/httpd
# PHP Config values set in httpd vhost config
+
+# Allow uploading files up to 64MB in size.
+# NOTE: if you change one of these values you will need to change the other one likewise.
php_upload_max_filesize: "64M"
php_post_max_size: "64M"