Ticket #5050: 0001-move-paste.ini-to-paste.example.ini.2.patch

File 0001-move-paste.ini-to-paste.example.ini.2.patch, 5.6 KB (added by ayleph, 9 years ago)

  • .gitignore 

    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 b  
    2828*.egg/
    2929/env
    3030/mediagoblin.ini
     31/paste.ini
    3132/node_modules/
    3233
    3334# pyconfigure/automake generated files

  • Makefile.in 

    diff --git a/Makefile.in b/Makefile.in
index 5964a82..a304e39 100644
    a b endif  
    101101extlib:
    102102        ./devtools/update_extlib.sh
    103103
    104 develop: $(maybe_venv_dep) i18n mediagoblin.ini
     104develop: $(maybe_venv_dep) i18n paste.ini mediagoblin.ini
     105
     106# NEVER clobber a user's paste.ini once they've defined it
     107paste.ini:
     108        cp --no-clobber paste.example.ini paste.ini
    105109
    106110# NEVER clobber a user's mediagoblin.ini once they've defined it
    107111mediagoblin.ini:
    108112        cp --no-clobber mediagoblin.example.ini mediagoblin.ini
    109113
    110 # base-configs: paste.ini mediagoblin.example.ini
     114# base-configs: paste.example.ini mediagoblin.example.ini
    111115
    112116install: installdirs
    113117        $(maybe_venved_python) $(srcdir)/setup.py install --prefix=$(DESTDIR)$(prefix)

  • new file paste.example.ini 

    diff --git a/paste.example.ini b/paste.example.ini
new file mode 100644
index 0000000..68fd9de
    - +  
     1# If you want to make changes to this file, first copy it to
     2# paste_local.ini, then make the changes there.
     3
     4[DEFAULT]
     5# Set to true to enable web-based debugging messages and etc.
     6debug = false
     7
     8[pipeline:main]
     9pipeline = errors mediagoblin
     10
     11[app:mediagoblin]
     12use = egg:mediagoblin#app
     13config = %(here)s/mediagoblin_local.ini %(here)s/mediagoblin.ini
     14# static paths
     15/mgoblin_media = %(here)s/user_dev/media/public
     16/mgoblin_static = %(here)s/mediagoblin/static
     17/theme_static = %(here)s/user_dev/theme_static
     18/plugin_static = %(here)s/user_dev/plugin_static
     19
     20[loggers]
     21keys = root
     22
     23[handlers]
     24keys = console
     25
     26[formatters]
     27keys = generic
     28
     29[logger_root]
     30level = INFO
     31handlers = console
     32
     33[handler_console]
     34class = StreamHandler
     35args = (sys.stderr,)
     36level = NOTSET
     37formatter = generic
     38
     39[formatter_generic]
     40format = %(asctime)s %(levelname)-7.7s [%(name)s] %(message)s
     41
     42[filter:errors]
     43use = egg:mediagoblin#errors
     44debug = false
     45
     46
     47##############################
     48# Server configuration options
     49##############################
     50
     51# The server that is run by default.
     52# By default, should only be accessable locally
     53[server:main]
     54use = egg:mediagoblin#paste_server_selector
     55host = 127.0.0.1
     56port = 6543
     57# Gunicorn settings. See http://docs.gunicorn.org/en/19.0/settings.html
     58# for more information about configuring Gunicorn
     59proc_name = gmg
     60reload = true
     61accesslog = -
     62
     63#######################
     64# Helper server configs
     65# ---------------------
     66#   If you are configuring the paste config manually, you can remove
     67#   these.
     68
     69# Use this if you want to run on port 6543 and have MediaGoblin be
     70# viewable externally
     71[server:broadcast]
     72use = egg:Paste#http
     73host = 0.0.0.0
     74port = 6543
     75
     76# Use this if you want to connect via fastcgi
     77[server:fcgi]
     78use = egg:flup#fcgi_fork
     79host = %(fcgi_host)s
     80port = %(fcgi_port)s
     81
     82[server:http]
     83use = egg:Paste#http
     84host = %(http_host)s
     85port = %(http_port)s

  • deleted file paste.ini 

    diff --git a/paste.ini b/paste.ini
deleted file mode 100644
index 68fd9de..0000000
    + -  
    1 # If you want to make changes to this file, first copy it to
    2 # paste_local.ini, then make the changes there.
    3 
    4 [DEFAULT]
    5 # Set to true to enable web-based debugging messages and etc.
    6 debug = false
    7 
    8 [pipeline:main]
    9 pipeline = errors mediagoblin
    10 
    11 [app:mediagoblin]
    12 use = egg:mediagoblin#app
    13 config = %(here)s/mediagoblin_local.ini %(here)s/mediagoblin.ini
    14 # static paths
    15 /mgoblin_media = %(here)s/user_dev/media/public
    16 /mgoblin_static = %(here)s/mediagoblin/static
    17 /theme_static = %(here)s/user_dev/theme_static
    18 /plugin_static = %(here)s/user_dev/plugin_static
    19 
    20 [loggers]
    21 keys = root
    22 
    23 [handlers]
    24 keys = console
    25 
    26 [formatters]
    27 keys = generic
    28 
    29 [logger_root]
    30 level = INFO
    31 handlers = console
    32 
    33 [handler_console]
    34 class = StreamHandler
    35 args = (sys.stderr,)
    36 level = NOTSET
    37 formatter = generic
    38 
    39 [formatter_generic]
    40 format = %(asctime)s %(levelname)-7.7s [%(name)s] %(message)s
    41 
    42 [filter:errors]
    43 use = egg:mediagoblin#errors
    44 debug = false
    45 
    46 
    47 ##############################
    48 # Server configuration options
    49 ##############################
    50 
    51 # The server that is run by default.
    52 # By default, should only be accessable locally
    53 [server:main]
    54 use = egg:mediagoblin#paste_server_selector
    55 host = 127.0.0.1
    56 port = 6543
    57 # Gunicorn settings. See http://docs.gunicorn.org/en/19.0/settings.html
    58 # for more information about configuring Gunicorn
    59 proc_name = gmg
    60 reload = true
    61 accesslog = -
    62 
    63 #######################
    64 # Helper server configs
    65 # ---------------------
    66 #   If you are configuring the paste config manually, you can remove
    67 #   these.
    68 
    69 # Use this if you want to run on port 6543 and have MediaGoblin be
    70 # viewable externally
    71 [server:broadcast]
    72 use = egg:Paste#http
    73 host = 0.0.0.0
    74 port = 6543
    75 
    76 # Use this if you want to connect via fastcgi
    77 [server:fcgi]
    78 use = egg:flup#fcgi_fork
    79 host = %(fcgi_host)s
    80 port = %(fcgi_port)s
    81 
    82 [server:http]
    83 use = egg:Paste#http
    84 host = %(http_host)s
    85 port = %(http_port)s