Remove unused configs, unused requirements
This commit is contained in:
Nico Schottelius
parent
29c93c6f81
commit
d2e0b26c40
5 changed files with 0 additions and 366 deletions
|
|
@ -1,69 +0,0 @@
|
|||
user www-data;
|
||||
worker_processes 2;
|
||||
pid /var/run/nginx.pid;
|
||||
daemon off;
|
||||
|
||||
events {
|
||||
worker_connections 512;
|
||||
# multi_accept on;
|
||||
}
|
||||
|
||||
http {
|
||||
sendfile on;
|
||||
tcp_nopush on;
|
||||
tcp_nodelay on;
|
||||
keepalive_timeout 65;
|
||||
types_hash_max_size 2048;
|
||||
server_tokens off;
|
||||
port_in_redirect on;
|
||||
|
||||
server_names_hash_bucket_size 128;
|
||||
server_name_in_redirect off;
|
||||
|
||||
client_max_body_size 60m;
|
||||
|
||||
include /etc/nginx/mime.types;
|
||||
default_type application/octet-stream;
|
||||
|
||||
send_timeout 300;
|
||||
client_body_timeout 300;
|
||||
client_header_timeout 300;
|
||||
|
||||
access_log /logs/access.log;
|
||||
error_log /logs/error.log;
|
||||
|
||||
gzip on;
|
||||
gzip_disable "msie6";
|
||||
gzip_vary on;
|
||||
gzip_proxied any;
|
||||
gzip_comp_level 6;
|
||||
gzip_buffers 16 8k;
|
||||
gzip_http_version 1.1;
|
||||
gzip_types text/plain text/css application/json application/x-javascript text/xml application/xml application/xml+rss text/javascript;
|
||||
|
||||
upstream django {
|
||||
server 127.0.0.1:8000;
|
||||
}
|
||||
|
||||
server {
|
||||
listen 80 default;
|
||||
server_name localhost;
|
||||
location / {
|
||||
proxy_pass http://django;
|
||||
include proxy_params;
|
||||
}
|
||||
location /media/ {
|
||||
root /data;
|
||||
expires max;
|
||||
access_log off;
|
||||
}
|
||||
location /static/ {
|
||||
root /data;
|
||||
expires max;
|
||||
access_log off;
|
||||
}
|
||||
location ~ /\.ht { deny all; }
|
||||
location ~ /\.hg { deny all; }
|
||||
location ~ /\.svn { deny all; }
|
||||
}
|
||||
}
|
||||
|
|
@ -1,25 +0,0 @@
|
|||
server {
|
||||
listen 80;
|
||||
server_name dynamicweb-staging.ungleich.ch;
|
||||
|
||||
location /static {
|
||||
alias /home/app/django/dynamicweb/static/;
|
||||
}
|
||||
|
||||
location /media {
|
||||
alias /home/app/django/dynamicweb/media/;
|
||||
}
|
||||
|
||||
location / {
|
||||
proxy_pass http://127.0.0.1:8000/;
|
||||
proxy_pass_header Server;
|
||||
proxy_set_header Host $host;
|
||||
proxy_set_header X-Forwarded-Host $host;
|
||||
proxy_redirect off;
|
||||
proxy_set_header X-Real-IP $remote_addr;
|
||||
proxy_set_header X-Scheme $scheme;
|
||||
proxy_connect_timeout 600;
|
||||
proxy_send_timeout 600;
|
||||
proxy_read_timeout 600;
|
||||
}
|
||||
}
|
||||
|
|
@ -1,49 +0,0 @@
|
|||
git
|
||||
build-essential
|
||||
autoconf
|
||||
imagemagick
|
||||
libbz2-dev
|
||||
libcurl4-openssl-dev
|
||||
#libevent-dev
|
||||
libffi-dev
|
||||
libglib2.0-dev
|
||||
libjpeg-dev
|
||||
liblzma-dev
|
||||
libmagickcore-dev
|
||||
libmagickwand-dev
|
||||
#libncurses-dev
|
||||
libpq-dev
|
||||
libreadline-dev
|
||||
libssl-dev
|
||||
libxml2-dev
|
||||
libxslt-dev
|
||||
libyaml-dev
|
||||
zlib1g-dev
|
||||
python3-dev
|
||||
virtualenvwrapper
|
||||
libzmq-dev
|
||||
libevent-dev
|
||||
nginx
|
||||
libncurses-dev
|
||||
postgresql
|
||||
postgresql-client-9.4
|
||||
postgresql-server-dev-9.4
|
||||
memcached
|
||||
libmemcached-dev
|
||||
libxml2-dev
|
||||
libxslt1-dev
|
||||
python3-lxml
|
||||
libfreetype6
|
||||
libfreetype6-dev
|
||||
zlib1g-dev
|
||||
libtiff5-dev
|
||||
libjpeg62-turbo-dev
|
||||
zlib1g-dev
|
||||
libfreetype6-dev
|
||||
liblcms2-dev
|
||||
libwebp-dev
|
||||
tcl8.6-dev
|
||||
tk8.6-dev
|
||||
python-tk
|
||||
libmemcached
|
||||
libmemcached-dev
|
||||
|
|
@ -1,121 +0,0 @@
|
|||
<<<<<<< HEAD
|
||||
# django
|
||||
django>=1.8
|
||||
|
||||
django-dotenv
|
||||
django-parler
|
||||
django-bootstrap3
|
||||
django_compressor
|
||||
|
||||
# django-cms + plugins
|
||||
django-cms
|
||||
djangocms-admin-style
|
||||
djangocms-flash
|
||||
djangocms-googlemap
|
||||
djangocms-inherit
|
||||
djangocms-link
|
||||
djangocms-snippet
|
||||
djangocms-teaser
|
||||
djangocms-page-meta
|
||||
cmsplugin-filer
|
||||
django-reversion
|
||||
djangocms-text-ckeditor
|
||||
|
||||
django-taggit
|
||||
django-taggit-autosuggest
|
||||
|
||||
djangocms-blog
|
||||
|
||||
# lib
|
||||
psycopg2>=2.6
|
||||
# memcache
|
||||
pylibmc
|
||||
|
||||
|
||||
|
||||
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
|
||||
|
||||
Pillow>=2
|
||||
html5lib==0.999
|
||||
six==1.3.0 #compat
|
||||
python-memcached
|
||||
|
||||
|
||||
# django-assets
|
||||
lesscpy
|
||||
|
||||
# django apps
|
||||
django-treebeard>=4.0
|
||||
django-sekizai>=0.9
|
||||
django-filer>=1.1.1
|
||||
django-classy-tags>=0.7.1
|
||||
|
||||
|
||||
# django-cms-plugins
|
||||
djangocms-admin-style==0.2.5
|
||||
django-select2>=4.3.1
|
||||
|
||||
|
||||
djangocms-style
|
||||
djangocms-column
|
||||
djangocms-grid
|
||||
djangocms-oembed
|
||||
djangocms-table
|
||||
|
||||
|
||||
# production
|
||||
# circus-web
|
||||
# chaussette
|
||||
# meinheld
|
||||
|
||||
# python3 support
|
||||
gevent>=1.1a2
|
||||
=======
|
||||
Django==1.9.4
|
||||
aldryn-newsblog
|
||||
wheel
|
||||
django-bootstrap3
|
||||
django-cms
|
||||
django-compressor
|
||||
django-filter
|
||||
django-taggit
|
||||
django-taggit-autosuggest
|
||||
django-taggit-templatetags
|
||||
django-templatetag-sugar
|
||||
django-model-utils
|
||||
djangocms-blog
|
||||
django-dotenv
|
||||
psycopg2
|
||||
django-mptt
|
||||
easy_thumbnails
|
||||
django-polymorphic
|
||||
|
||||
#PLUGINS
|
||||
djangocms_flash
|
||||
djangocms_googlemap
|
||||
djangocms_inherit
|
||||
djangocms_link
|
||||
djangocms_teaser
|
||||
djangocms_page_meta
|
||||
djangocms_text_ckeditor
|
||||
djangocms_file
|
||||
djangocms_picture
|
||||
djangocms_video
|
||||
|
||||
#PAYMENT
|
||||
stripe
|
||||
|
||||
django-treebeard
|
||||
django-sekizai
|
||||
django-classy-tags
|
||||
djangocms-admin-style
|
||||
html5lib
|
||||
six
|
||||
|
||||
# Optional, recommended packages
|
||||
Pillow>=2
|
||||
django-filer
|
||||
cmsplugin-filer
|
||||
django-reversion
|
||||
pylibmc
|
||||
>>>>>>> 006d49d7dbddcfd9bb24c40d1f1939b902bc1fc4
|
||||
|
|
@ -1,102 +0,0 @@
|
|||
aldryn-blog==0.4.6
|
||||
aldryn-boilerplates==0.7
|
||||
aldryn-common==0.1.3
|
||||
aldryn-search==0.2.7
|
||||
anyjson==0.3.3
|
||||
chaussette==1.3.0
|
||||
cmsplugin-filer==1.0.1
|
||||
cssselect==0.9.1
|
||||
Django
|
||||
django-admin-enhancer==1.0.0
|
||||
django-appconf==1.0.1
|
||||
django-appdata==0.1.4
|
||||
django-bootstrap3==7.0.0
|
||||
django-classy-tags==0.7.1
|
||||
django-cms==3.2.1
|
||||
django-compressor==1.5
|
||||
django-countries==3.3
|
||||
django-debug-toolbar==1.3.2
|
||||
django-dotenv==1.3.0
|
||||
django-extensions==1.5.5
|
||||
django-filer==1.1.1
|
||||
django-filter==0.10.0
|
||||
django-formtools==1.0
|
||||
django-fsm==2.2.1
|
||||
django-fsm-admin==1.2.1
|
||||
django-guardian==1.2.0
|
||||
django-haystack==2.3.1
|
||||
django-hvad==1.2.1
|
||||
-e git+git@github.com:agiliq/merchant.git@2584954a1371ee6c7d11be2d75a94402e7c641d8#egg=django_merchant
|
||||
django-meta==0.3.1
|
||||
django-meta-mixin==0.1.1
|
||||
django-model-utils==2.2
|
||||
django-money==0.7.0
|
||||
django-mptt==0.8.2
|
||||
django-parler==1.6.1
|
||||
django-polymorphic==0.8.1
|
||||
django-reversion==1.10.1
|
||||
django-sekizai==0.9.0
|
||||
Django-Select2==5.8.1
|
||||
django-sortedm2m==0.10.0
|
||||
django-spurl==0.6
|
||||
django-standard-form==1.1.1
|
||||
django-taggit==0.18.0
|
||||
django-taggit-autosuggest==0.2.8
|
||||
django-taggit-templatetags==0.2.5
|
||||
django-templatetag-sugar==1.0
|
||||
django-treebeard==4.0
|
||||
djangocms-admin-style==1.1.0
|
||||
djangocms-blog==0.5.0
|
||||
djangocms-column==1.5
|
||||
djangocms-flash==0.2.0
|
||||
djangocms-googlemap==0.3
|
||||
djangocms-grid==1.2
|
||||
djangocms-inherit==0.1
|
||||
djangocms-link==1.6.2
|
||||
djangocms-oembed==0.5
|
||||
djangocms-page-meta==0.5.5
|
||||
djangocms-snippet==1.5
|
||||
djangocms-style==1.5
|
||||
djangocms-table==1.2
|
||||
djangocms-teaser==0.1
|
||||
djangocms-text-ckeditor==2.6.0
|
||||
djangorestframework==3.1.3
|
||||
easy-thumbnails==2.3
|
||||
factory-boy==2.5.2
|
||||
gevent==1.1b5
|
||||
gnureadline==6.3.3
|
||||
greenlet==0.4.9
|
||||
html5lib==0.9999999
|
||||
iowait==0.2
|
||||
ipdb==0.8.1
|
||||
ipython==3.2.0
|
||||
lesscpy==0.10.2
|
||||
lxml==3.4.4
|
||||
Mako==1.0.2
|
||||
Markdown==2.6.2
|
||||
MarkupSafe==0.23
|
||||
meinheld==0.5.8
|
||||
micawber==0.3.3
|
||||
mock==1.3.0
|
||||
pbr==1.8.1
|
||||
Pillow==3.1.1
|
||||
ply==3.6
|
||||
psutil==3.2.1
|
||||
psycopg2==2.6.1
|
||||
py-moneyed==0.5.0
|
||||
pylibmc==1.5.0
|
||||
pyquery==1.2.9
|
||||
python-memcached==1.57
|
||||
pytz==2015.6
|
||||
pyzmq==14.7.0
|
||||
requests==2.9.1
|
||||
simplejson==3.8.0
|
||||
six==1.10.0
|
||||
sqlparse==0.1.15
|
||||
stripe==1.30.0
|
||||
tomako==0.1.0
|
||||
TornadIO2==0.0.3
|
||||
tornado==4.2.1
|
||||
Unidecode==0.4.19
|
||||
URLObject==2.4.0
|
||||
YURL==0.13
|
||||
Loading…
Reference in a new issue