Commit graph

132 commits

Author SHA1 Message Date
7b2bb05a80 better by requirements 2015-06-14 15:55:18 -06:00
9cf8bcd7f3 spec v0.1
Signed-off-by: rscnt <rascnt@gmail.com>
2015-06-12 09:39:18 -06:00
207fc31417 Merge branch 'develop' of git.ungleich.ch:dynamicweb into develop 2015-06-10 21:19:47 -06:00
ed91919dbe changes on readme 2015-06-10 21:18:19 -06:00
Nico Schottelius
9593ae5ff6 use django-select2-py3 from github
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
2015-06-10 23:37:39 +02:00
Nico Schottelius
cd234c4dda digital_glarus -> digitalglarus
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
2015-06-10 23:34:33 +02:00
Nico Schottelius
242219d275 remove duplicate django entry
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
2015-06-10 23:28:24 +02:00
Nico Schottelius
8aacdd53e9 move djangocms-text-ckeditor to 2.5.2 to work with migrations
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
2015-06-10 23:13:12 +02:00
Nico Schottelius
a26a2ec105 mount cms below cms - easier for nginx mapping
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
2015-06-10 21:16:08 +02:00
dcb97295f0 stable_requirements 2015-06-10 09:53:23 -06:00
7066e190e8 added {README,DEPLOY}.rst
Signed-off-by: rscnt <rascnt@gmail.com>
2015-06-09 02:28:10 -06:00
ef9849c56f Makefile, refactor.
Signed-off-by: rscnt <rascnt@gmail.com>
2015-06-09 02:27:10 -06:00
9ed29bcdb4 configs: circus example to match with staging.
Signed-off-by: rscnt <rascnt@gmail.com>
2015-06-09 02:26:56 -06:00
2915d7f81e configs: nginx proxy example to match with staging.
Signed-off-by: rscnt <rascnt@gmail.com>
2015-06-09 02:26:41 -06:00
b138526c8f settings: the migration module for django_cms_text_ckeditor changed.
It would be better to use an stable.requirements.txt

Signed-off-by: rscnt <rascnt@gmail.com>
2015-06-09 01:49:48 -06:00
376f637ec7 requirements: debian, added essential packages.
Signed-off-by: rscnt <rascnt@gmail.com>
2015-06-09 00:38:13 -06:00
ab643fb3f6 requirements: debian, added git.
Signed-off-by: rscnt <rascnt@gmail.com>
2015-06-09 00:30:37 -06:00
bb7f0cf73a Makefile, added install_debian_packages task.
install_debian_packages:

   Simply excutes apt-get update and installs the
   packages listed in ./requirements.debian.txt

Signed-off-by: rscnt <rascnt@gmail.com>
2015-06-08 23:29:44 -06:00
fe4f6c97d5 new static files.
Signed-off-by: rscnt <rascnt@gmail.com>
2015-06-08 23:26:27 -06:00
83e792bcaa makefile, rsync_upload ignoring .pyc files and vim cache.
Signed-off-by: rscnt <rascnt@gmail.com>
2015-06-08 23:22:58 -06:00
12b418ca08 added Makefile with only one task "rsync_upload".
I wanted to use fabric, but it's to much hassle.

The rsync_upload task uploads the project using rsync by ssh.

Signed-off-by: rscnt <rascnt@gmail.com>
2015-06-08 23:19:00 -06:00
f58c7dfc75 ignore emacs cache files 2015-06-08 23:03:13 -06:00
e18b445724 deleted "libjpeg".
Signed-off-by: rscnt <rascnt@gmail.com>
2015-06-08 22:56:15 -06:00
3cc98b608e requirements: debian, postgresql-dev don't exists.
+ Added package "postgresql-client-9.4"

Signed-off-by: rscnt <rascnt@gmail.com>
2015-06-08 22:49:51 -06:00
e4a79a8541 requirements: debian, replaced libjpeg package.
+ libjpeg8 -> libjpeg62-turbo-dev
+ Removed comment segment on python3-lxml so we can
  do xargs.

Signed-off-by: rscnt <rascnt@gmail.com>
2015-06-08 22:45:05 -06:00
상희 김
42ad6efe7c font Raleway, room img replaced 2015-06-08 20:24:56 +02:00
상희 김
e26edfdf09 Merge branch 'master' of git.ungleich.ch:dynamicweb into railshosting 2015-06-08 19:04:43 +02:00
34990d687b debian: added Pillow dependencies.
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-31 07:32:39 -06:00
d7b809f3f6 Merge branch 'feature/production-1.1' into develop 2015-05-31 05:44:07 -06:00
090df0798c configs: added circus config example.
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-31 05:36:57 -06:00
3338894c23 configs: added nginx conf example
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-31 05:36:45 -06:00
f3b560f602 settings: options for text editor and let host use x forwarded
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-31 05:32:11 -06:00
24c263811a settings: fixed typo on media.
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-31 04:52:53 -06:00
1fa008a999 Merge branch 'develop' of git.ungleich.ch:dynamicweb into feature/production-1.1 2015-05-30 23:22:31 -06:00
9f4b59384a requirements: added gevent and circus git.
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-30 23:18:11 -06:00
37968cfa71 configs: ungleich circus.
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-30 23:17:58 -06:00
f2506eb26f config: added admin
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-30 20:29:49 -06:00
f5f35b859b templates: added 404 and 505.
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-30 20:29:38 -06:00
6a2e819155 Merge branch 'feature/integrate-railshosting' into develop 2015-05-30 15:31:57 -06:00
68ce62d503 migrations: merge brings the same migration.
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-30 15:31:07 -06:00
5829c9fa4a Merge branch 'railshosting' of git.ungleich.ch:dynamicweb into feature/integrate-railshosting
Conflicts:
dynamicweb/settings.py
    Added railshosting app and deleted .settings_local import.
dynamicweb/urls.py
   Added railshosting url.

Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-30 15:29:33 -06:00
9d521f3384 configs: added include proxy conf example.
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-28 02:30:28 -06:00
0734110804 configs: replaced gevent with meinheld.
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-28 02:30:14 -06:00
f087832151 configs: debian packages added
- added circus nginx conf fix.

Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-28 02:10:21 -06:00
755f70a1ef config: nginx example, prefered a complete config
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-28 02:09:19 -06:00
d80b3835ca config: circus fixed nginx example.
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-28 02:09:05 -06:00
1d70f97347 conf: added example conf for nginx proxy
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-28 00:40:07 -06:00
9be99ab8ee conf: added circus .init for nginx
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-28 00:39:48 -06:00
62c0f014ab config: added circus .ini for webapp
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-28 00:39:28 -06:00
6b5d43a553 requirements: added gevent.
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-28 00:39:14 -06:00