Commit graph

1816 commits

Author SHA1 Message Date
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
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
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
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
f58c7dfc75 ignore emacs cache files 2015-06-08 23:03:13 -06:00
36797bbd0f 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
e209282136 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
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
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
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
상희 김
42ad6efe7c font Raleway, room img replaced 2015-06-08 20:24:56 +02:00
상희 김
808176f12b 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
상희 김
decc01b641 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
7e4ed0a5d9 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
29b86ed501 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
b5863b2c2a 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
ea45fc77e0 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
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
24c263811a settings: fixed typo on media.
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-31 04:52:53 -06:00
9fe61554a7 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
411588d6d3 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
d10e7fc0b5 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
ad48104d3a 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
5ef00d1bb9 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
182335fd10 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
e4aa678152 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
a52cd6d44d 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
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
9d521f3384 configs: added include proxy conf example.
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-28 02:30:28 -06:00
088a271d54 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
0e9d71512e 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
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