diff options
author | Borislav Glozman <Borislav.Glozman@amdocs.com> | 2019-02-10 16:44:11 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@onap.org> | 2019-02-10 16:44:11 +0000 |
commit | ca88db9c9fe1b5fd41884feca07e3866b8d910b3 (patch) | |
tree | 58d8917c9297e426dd688ebe992426f459d6cc83 /kubernetes/vvp/charts/vvp-cms-uwsgi/resources/config/cms/storage.py | |
parent | b1e4944e5cb88a2a6fadcd39fca7d2e935a7b267 (diff) | |
parent | 477eb5c164afc2cc64c61844b9d1c859d17f3269 (diff) |
Merge "Remove VVP from OOM"
Diffstat (limited to 'kubernetes/vvp/charts/vvp-cms-uwsgi/resources/config/cms/storage.py')
-rw-r--r-- | kubernetes/vvp/charts/vvp-cms-uwsgi/resources/config/cms/storage.py | 50 |
1 files changed, 0 insertions, 50 deletions
diff --git a/kubernetes/vvp/charts/vvp-cms-uwsgi/resources/config/cms/storage.py b/kubernetes/vvp/charts/vvp-cms-uwsgi/resources/config/cms/storage.py deleted file mode 100644 index 0abfae9035..0000000000 --- a/kubernetes/vvp/charts/vvp-cms-uwsgi/resources/config/cms/storage.py +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright © 2018 Amdocs, AT&T, Bell Canada -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -""" -storage.py - -In order to make Django store trusted static files and untrusted media -(user-uploaded) files in separate s3 buckets, we must create two different -storage classes. - -https://www.caktusgroup.com/blog/2014/11/10/Using-Amazon-S3-to-store-your-Django-sites-static-and-media-files/ -http://www.leehodgkinson.com/blog/my-mezzanine-s3-setup/ - -""" - -# FIXME this module never changes so might not need not be kept in a -# configmap. Also it is (almost) the same as what we use in em; that does -# not use S3BotoStorageMixin. - -# There is a newer storage based on boto3 but that doesn't support changing -# the HOST, as we need to for non-amazon s3 services. It does support an -# "endpoint"; setting AWS_S3_ENDPOINT_URL may cause it to work. -from storages.backends.s3boto import S3BotoStorage -from filebrowser_safe.storage import S3BotoStorageMixin -from django.conf import settings - - -# NOTE for some reason, collectstatic uploads to bucket/location but the -# urls constructed are domain/location -class S3StaticStorage(S3BotoStorage, S3BotoStorageMixin): - custom_domain = '%s/%s' % (settings.AWS_S3_HOST, settings.STATIC_BUCKET) - bucket_name = settings.STATIC_BUCKET - # location = ... - - -class S3MediaStorage(S3BotoStorage, S3BotoStorageMixin): - custom_domain = '%s/%s' % (settings.AWS_S3_HOST, settings.MEDIA_BUCKET) - bucket_name = settings.MEDIA_BUCKET - # location = ... |