Commit graph

176 commits

Author SHA1 Message Date
Nico Schottelius
c93b044bf0 remove duplicate django entry
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
2015-06-10 23:28:24 +02:00
Nico Schottelius
71823b12c8 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
46ce08909d 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
fe81faf015 stable_requirements 2015-06-10 09:53:23 -06:00
91f02d5c8e added {README,DEPLOY}.rst
Signed-off-by: rscnt <rascnt@gmail.com>
2015-06-09 02:28:10 -06:00
4b912cceab Makefile, refactor.
Signed-off-by: rscnt <rascnt@gmail.com>
2015-06-09 02:27:10 -06:00
5795d2c193 configs: circus example to match with staging.
Signed-off-by: rscnt <rascnt@gmail.com>
2015-06-09 02:26:56 -06:00
ed4f7f5721 configs: nginx proxy example to match with staging.
Signed-off-by: rscnt <rascnt@gmail.com>
2015-06-09 02:26:41 -06:00
ae0ece8f18 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
07a50b8627 requirements: debian, added essential packages.
Signed-off-by: rscnt <rascnt@gmail.com>
2015-06-09 00:38:13 -06:00
b173facd67 requirements: debian, added git.
Signed-off-by: rscnt <rascnt@gmail.com>
2015-06-09 00:30:37 -06:00
a1bc6ea99a 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
bb68c32ba5 new static files.
Signed-off-by: rscnt <rascnt@gmail.com>
2015-06-08 23:26:27 -06:00
5da7cfab99 makefile, rsync_upload ignoring .pyc files and vim cache.
Signed-off-by: rscnt <rascnt@gmail.com>
2015-06-08 23:22:58 -06:00
bc8f440391 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
36797bbd0f ignore emacs cache files 2015-06-08 23:03:13 -06:00
e209282136 deleted "libjpeg".
Signed-off-by: rscnt <rascnt@gmail.com>
2015-06-08 22:56:15 -06:00
7b7d7e5dd4 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
10c88fabc3 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
상희 김
808176f12b font Raleway, room img replaced 2015-06-08 20:24:56 +02:00
상희 김
decc01b641 Merge branch 'master' of git.ungleich.ch:dynamicweb into railshosting 2015-06-08 19:04:43 +02:00
7e4ed0a5d9 debian: added Pillow dependencies.
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-31 07:32:39 -06:00
29b86ed501 Merge branch 'feature/production-1.1' into develop 2015-05-31 05:44:07 -06:00
b5863b2c2a configs: added circus config example.
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-31 05:36:57 -06:00
ea45fc77e0 configs: added nginx conf example
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-31 05:36:45 -06:00
de74539fa6 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
9fe61554a7 settings: fixed typo on media.
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-31 04:52:53 -06:00
411588d6d3 Merge branch 'develop' of git.ungleich.ch:dynamicweb into feature/production-1.1 2015-05-30 23:22:31 -06:00
d10e7fc0b5 requirements: added gevent and circus git.
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-30 23:18:11 -06:00
ad48104d3a configs: ungleich circus.
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-30 23:17:58 -06:00
5ef00d1bb9 config: added admin
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-30 20:29:49 -06:00
182335fd10 templates: added 404 and 505.
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-30 20:29:38 -06:00
e4aa678152 Merge branch 'feature/integrate-railshosting' into develop 2015-05-30 15:31:57 -06:00
a52cd6d44d migrations: merge brings the same migration.
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-30 15:31:07 -06:00
5d9c306573 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
088a271d54 configs: added include proxy conf example.
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-28 02:30:28 -06:00
0e9d71512e configs: replaced gevent with meinheld.
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-28 02:30:14 -06:00
b9f7564048 configs: debian packages added
- added circus nginx conf fix.

Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-28 02:10:21 -06:00
1620a60905 config: nginx example, prefered a complete config
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-28 02:09:19 -06:00
b7be16f5ad config: circus fixed nginx example.
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-28 02:09:05 -06:00
b43ce77ad4 conf: added example conf for nginx proxy
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-28 00:40:07 -06:00
664fb735d9 conf: added circus .init for nginx
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-28 00:39:48 -06:00
a630d3be45 config: added circus .ini for webapp
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-28 00:39:28 -06:00
62bbd14dc4 requirements: added gevent.
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-28 00:39:14 -06:00
3044234a1d deleted foo.txt 2015-05-27 23:28:12 -06:00
4971c3cb7d requirements: added circus + chaussette.
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-27 23:22:52 -06:00
cc0988135e txt: added list of debian packages
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-27 23:22:40 -06:00
ff742091c5 settings: added memcached config.
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-27 23:22:20 -06:00
Nico Schottelius
c9c5935bff fix bottom script error
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
2015-05-27 21:48:41 +02:00
Nico Schottelius
b3e7698aea +migration
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
2015-05-27 21:31:35 +02:00