diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2014-10-09 18:51:05 -0500 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2014-10-10 14:42:17 -0500 |
| commit | 53463ad71d9f446ae801b437048be38f02474b15 (patch) | |
| tree | e31ff727eb7cb08253cb4d86359d8493f17a9e81 | |
| parent | ae361ba126522958cc4e0312dcc14aa752e0e65a (diff) | |
| download | mediagoblin-53463ad71d9f446ae801b437048be38f02474b15.tar.lz mediagoblin-53463ad71d9f446ae801b437048be38f02474b15.tar.xz mediagoblin-53463ad71d9f446ae801b437048be38f02474b15.zip | |
Move paste.ini, lazystarter.sh back to the right place
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rwxr-xr-x[-rw-r--r--] | lazystarter.sh (renamed from lazystarter.sh.in) | 0 | ||||
| -rw-r--r-- | paste.ini (renamed from paste.py3.ini) | 0 | ||||
| -rw-r--r-- | paste.py2.ini | 81 |
5 files changed, 0 insertions, 84 deletions
@@ -27,9 +27,7 @@ /server-log.txt *.egg/ /env -/paste.ini /mediagoblin.ini -/lazystarter.sh # pyconfigure/automake generated files /Makefile diff --git a/configure.ac b/configure.ac index 3784fd42..0d5eef6b 100644 --- a/configure.ac +++ b/configure.ac @@ -435,7 +435,6 @@ dnl######### dnl Define the files to be configured AC_CONFIG_FILES([Makefile]) -AC_CONFIG_FILES([lazystarter.sh], [chmod +x lazystarter.sh]) dnl Generate config.status AC_OUTPUT diff --git a/lazystarter.sh.in b/lazystarter.sh index f8da8aef..f8da8aef 100644..100755 --- a/lazystarter.sh.in +++ b/lazystarter.sh diff --git a/paste.py3.ini b/paste.ini index 77364c09..77364c09 100644 --- a/paste.py3.ini +++ b/paste.ini diff --git a/paste.py2.ini b/paste.py2.ini deleted file mode 100644 index 92cb4a1c..00000000 --- a/paste.py2.ini +++ /dev/null @@ -1,81 +0,0 @@ -# If you want to make changes to this file, first copy it to -# paste_local.ini, then make the changes there. - -[DEFAULT] -# Set to true to enable web-based debugging messages and etc. -debug = false - -[pipeline:main] -# pipeline = errors mediagoblin -pipeline = mediagoblin - -[app:mediagoblin] -use = egg:mediagoblin#app -config = %(here)s/mediagoblin_local.ini %(here)s/mediagoblin.ini -# static paths -/mgoblin_media = %(here)s/user_dev/media/public -/mgoblin_static = %(here)s/mediagoblin/static -/theme_static = %(here)s/user_dev/theme_static -/plugin_static = %(here)s/user_dev/plugin_static - -[loggers] -keys = root - -[handlers] -keys = console - -[formatters] -keys = generic - -[logger_root] -level = INFO -handlers = console - -[handler_console] -class = StreamHandler -args = (sys.stderr,) -level = NOTSET -formatter = generic - -[formatter_generic] -format = %(asctime)s %(levelname)-7.7s [%(name)s] %(message)s - -[filter:errors] -use = egg:mediagoblin#errors -debug = false - - -############################## -# Server configuration options -############################## - -# The server that is run by default. -# By default, should only be accessable locally -[server:main] -use = egg:Paste#http -host = 127.0.0.1 -port = 6543 - -####################### -# Helper server configs -# --------------------- -# If you are configuring the paste config manually, you can remove -# these. - -# Use this if you want to run on port 6543 and have MediaGoblin be -# viewable externally -[server:broadcast] -use = egg:Paste#http -host = 0.0.0.0 -port = 6543 - -# Use this if you want to connect via fastcgi -[server:fcgi] -use = egg:flup#fcgi_fork -host = %(fcgi_host)s -port = %(fcgi_port)s - -[server:http] -use = egg:Paste#http -host = %(http_host)s -port = %(http_port)s |