From b8952f6452550337c1781b73092342d54430e053 Mon Sep 17 00:00:00 2001 From: Oliver Marks Date: Wed, 22 Feb 2017 22:45:44 +0000 Subject: [PATCH] remove s from banner model, tweak permissions on gunicorn folder --- compose/django/Dockerfile | 8 +++-- compose/django/gunicorn.sh | 4 +-- mhackspace/base/admin.py | 6 ++-- .../management/commands/generate_test_data.py | 4 +-- .../migrations/0003_auto_20170222_2055.py | 35 +++++++++++++++++++ mhackspace/base/models.py | 2 +- mhackspace/base/templatetags/banner_images.py | 4 +-- .../migrations/0002_auto_20170222_2055.py | 20 +++++++++++ 8 files changed, 70 insertions(+), 13 deletions(-) create mode 100644 mhackspace/base/migrations/0003_auto_20170222_2055.py create mode 100644 mhackspace/users/migrations/0002_auto_20170222_2055.py diff --git a/compose/django/Dockerfile b/compose/django/Dockerfile index b26d2fd..96a5ef7 100644 --- a/compose/django/Dockerfile +++ b/compose/django/Dockerfile @@ -10,8 +10,12 @@ RUN pip install -r /requirements/production.txt \ && useradd -r -g django django COPY . /app -RUN chown -R django /app -RUN mkdir -p /data/sockets + +RUN mkdir -p /var/log/gunicorn/ \ + && mkdir -p /data/sockets \ + && chown -R django /app \ + && chown -R root:django /var/log/gunicorn/ \ + && chmod -R 770 /var/log/gunicorn/ COPY ./compose/django/gunicorn.sh /gunicorn.sh COPY ./compose/django/entrypoint.sh /entrypoint.sh diff --git a/compose/django/gunicorn.sh b/compose/django/gunicorn.sh index 809111f..6889382 100644 --- a/compose/django/gunicorn.sh +++ b/compose/django/gunicorn.sh @@ -1,7 +1,5 @@ #!/bin/sh python /app/manage.py collectstatic --noinput python /app/manage.py compilescss -mkdir /var/log/gunicorn/ -chown -R root:django /var/log/gunicorn/ -chmod -R 770 /var/log/gunicorn/ + /usr/local/bin/gunicorn config.wsgi -w 4 -b unix:/data/sockets/gunicorn.sock --error-logfile /var/log/gunicorn/gunicorn-error.log --chdir=/app diff --git a/mhackspace/base/admin.py b/mhackspace/base/admin.py index f9ef8e8..e8750f6 100644 --- a/mhackspace/base/admin.py +++ b/mhackspace/base/admin.py @@ -5,9 +5,9 @@ from django.conf.urls import url from django.http import HttpResponseRedirect from django.urls import reverse -from mhackspace.base.models import BannerImages +from mhackspace.base.models import BannerImage -@admin.register(BannerImages) -class BannerImagesAdmin(ModelAdmin): +@admin.register(BannerImage) +class BannerImageAdmin(ModelAdmin): list_display = ('title', 'url', 'displayed', 'date') diff --git a/mhackspace/base/management/commands/generate_test_data.py b/mhackspace/base/management/commands/generate_test_data.py index 884e532..b634e7c 100644 --- a/mhackspace/base/management/commands/generate_test_data.py +++ b/mhackspace/base/management/commands/generate_test_data.py @@ -2,7 +2,7 @@ from autofixture import AutoFixture from autofixture.generators import ImageGenerator from django.core.management.base import BaseCommand from django.core.management import call_command -from mhackspace.base.models import BannerImages +from mhackspace.base.models import BannerImage from mhackspace.feeds.models import Article, Feed from mhackspace.users.models import User @@ -27,7 +27,7 @@ class Command(BaseCommand): feeds = AutoFixture(Article) feeds.create(10) - banners = ImageFixture(BannerImages) + banners = ImageFixture(BannerImage) banners.create(10) self.stdout.write( self.style.SUCCESS( diff --git a/mhackspace/base/migrations/0003_auto_20170222_2055.py b/mhackspace/base/migrations/0003_auto_20170222_2055.py new file mode 100644 index 0000000..f83fc55 --- /dev/null +++ b/mhackspace/base/migrations/0003_auto_20170222_2055.py @@ -0,0 +1,35 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.5 on 2017-02-22 20:55 +from __future__ import unicode_literals + +from django.db import migrations, models +import django.utils.timezone +import stdimage.models +import stdimage.utils +import stdimage.validators + + +class Migration(migrations.Migration): + + dependencies = [ + ('base', '0002_auto_20170214_1911'), + ] + + operations = [ + migrations.CreateModel( + name='BannerImage', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('url', models.URLField()), + ('title', models.CharField(max_length=255)), + ('displayed', models.BooleanField(default=True)), + ('original_image', models.URLField(blank=True, max_length=255, null=True)), + ('scaled_image', stdimage.models.StdImageField(blank=True, null=True, upload_to=stdimage.utils.UploadToAutoSlugClassNameDir('title'), validators=[stdimage.validators.MinSizeValidator(1200, 300)])), + ('caption', models.TextField()), + ('date', models.DateTimeField(default=django.utils.timezone.now)), + ], + ), + migrations.DeleteModel( + name='BannerImages', + ), + ] diff --git a/mhackspace/base/models.py b/mhackspace/base/models.py index a7bd3d0..8550807 100644 --- a/mhackspace/base/models.py +++ b/mhackspace/base/models.py @@ -8,7 +8,7 @@ from stdimage.utils import UploadToAutoSlugClassNameDir from stdimage.validators import MinSizeValidator -class BannerImages(models.Model): +class BannerImage(models.Model): url = models.URLField() title = models.CharField(max_length=255) displayed = models.BooleanField(default=True) diff --git a/mhackspace/base/templatetags/banner_images.py b/mhackspace/base/templatetags/banner_images.py index 2111129..a478169 100644 --- a/mhackspace/base/templatetags/banner_images.py +++ b/mhackspace/base/templatetags/banner_images.py @@ -1,10 +1,10 @@ # -*- coding: utf-8 -*- from django import template -from mhackspace.base.models import BannerImages +from mhackspace.base.models import BannerImage register = template.Library() @register.inclusion_tag('partials/banner_list.html') def show_banner_images(): - return {'bannerlist': BannerImages.objects.all(), 'test': 'abc'} + return {'bannerlist': BannerImage.objects.all(), 'test': 'abc'} diff --git a/mhackspace/users/migrations/0002_auto_20170222_2055.py b/mhackspace/users/migrations/0002_auto_20170222_2055.py new file mode 100644 index 0000000..3830576 --- /dev/null +++ b/mhackspace/users/migrations/0002_auto_20170222_2055.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.5 on 2017-02-22 20:55 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('users', '0001_initial'), + ] + + operations = [ + migrations.AlterField( + model_name='membership', + name='status', + field=models.PositiveSmallIntegerField(choices=[(0, 'Guest user'), (1, 'Active membership'), (3, 'Membership Expired'), (4, 'Membership Cancelled')], default=0), + ), + ]