Move paste.ini, lazystarter.sh back to the right place

diff --git a/.gitignore b/.gitignore
index bec063ded0c346ce30ad6dedec83d9695e70ccb1..e6d032941ffedf7be989cc1688d9b9ad0af9cc5d 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -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 3784fd4296cf0a508f7c6b3676c9709c5fc4100e..0d5eef6b6f8c55cbf190fbcbe8b3dd12f572d63c 100644 (file)
--- 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
old mode 100644 (file)
new mode 100755 (executable)
similarity index 100%
rename from lazystarter.sh.in
rename to lazystarter.sh

diff --git a/paste.py3.ini b/paste.ini
similarity index 100%
rename from paste.py3.ini
rename to paste.ini

diff --git a/paste.py2.ini b/paste.py2.ini
deleted file mode 100644 (file)
index 92cb4a1..0000000
--- 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