From c169dc0b6bc117dd30c58de896970b1a26b81031 Mon Sep 17 00:00:00 2001
From: ayleph <ayleph@thisshitistemp.com>
Date: Tue, 10 Mar 2015 22:30:58 -0700
Subject: [PATCH] move paste.ini to paste.example.ini

---
 .gitignore        |  1 +
 Makefile.in       |  8 ++++--
 paste.example.ini | 85 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 paste.ini         | 85 -------------------------------------------------------
 4 files changed, 92 insertions(+), 87 deletions(-)
 create mode 100644 paste.example.ini
 delete mode 100644 paste.ini

diff --git a/.gitignore b/.gitignore
index a38c65a..e8b0432 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,6 +28,7 @@
 *.egg/
 /env
 /mediagoblin.ini
+/paste.ini
 /node_modules/
 
 # pyconfigure/automake generated files
diff --git a/Makefile.in b/Makefile.in
index 5964a82..a304e39 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -101,13 +101,17 @@ endif
 extlib:
 	./devtools/update_extlib.sh
 
-develop: $(maybe_venv_dep) i18n mediagoblin.ini
+develop: $(maybe_venv_dep) i18n paste.ini mediagoblin.ini
+
+# NEVER clobber a user's paste.ini once they've defined it
+paste.ini:
+	cp --no-clobber paste.example.ini paste.ini
 
 # NEVER clobber a user's mediagoblin.ini once they've defined it
 mediagoblin.ini:
 	cp --no-clobber mediagoblin.example.ini mediagoblin.ini
 
-# base-configs: paste.ini mediagoblin.example.ini
+# base-configs: paste.example.ini mediagoblin.example.ini
 
 install: installdirs
 	$(maybe_venved_python) $(srcdir)/setup.py install --prefix=$(DESTDIR)$(prefix)
diff --git a/paste.example.ini b/paste.example.ini
new file mode 100644
index 0000000..68fd9de
--- /dev/null
+++ b/paste.example.ini
@@ -0,0 +1,85 @@
+# 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
+
+[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:mediagoblin#paste_server_selector
+host = 127.0.0.1
+port = 6543
+# Gunicorn settings. See http://docs.gunicorn.org/en/19.0/settings.html
+# for more information about configuring Gunicorn
+proc_name = gmg
+reload = true
+accesslog = -
+
+#######################
+# 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
diff --git a/paste.ini b/paste.ini
deleted file mode 100644
index 68fd9de..0000000
--- a/paste.ini
+++ /dev/null
@@ -1,85 +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
-
-[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:mediagoblin#paste_server_selector
-host = 127.0.0.1
-port = 6543
-# Gunicorn settings. See http://docs.gunicorn.org/en/19.0/settings.html
-# for more information about configuring Gunicorn
-proc_name = gmg
-reload = true
-accesslog = -
-
-#######################
-# 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
-- 
2.3.1