Merge branch 'master' into microsoft-auth-wip
This commit is contained in:
commit
fbb69c843a
2 changed files with 11 additions and 3 deletions
10
app/app.py
10
app/app.py
|
@ -8,7 +8,9 @@ import typing
|
|||
from datetime import datetime
|
||||
from logging.handlers import TimedRotatingFileHandler
|
||||
|
||||
from flask import Flask, render_template
|
||||
from admin import init_admin
|
||||
from config import Configuration
|
||||
from flask import Flask, render_template, Response
|
||||
from flask_bootstrap import Bootstrap, StaticCDN
|
||||
from flask_debugtoolbar import DebugToolbarExtension
|
||||
from flask_login import LoginManager
|
||||
|
@ -165,6 +167,12 @@ def create_app():
|
|||
"""Initializer for the Flask app object"""
|
||||
app = Flask(__name__)
|
||||
|
||||
@app.route('/robots.txt')
|
||||
def noindex():
|
||||
r = Response(response="User-Agent: *\nDisallow: /\n", status=200, mimetype="text/plain")
|
||||
r.headers["Content-Type"] = "text/plain; charset=utf-8"
|
||||
return r
|
||||
|
||||
# Load the config file
|
||||
app.config.from_object("config.Configuration")
|
||||
|
||||
|
|
|
@ -29,9 +29,9 @@ location = >location_header items:{ block } ;
|
|||
|
||||
|
||||
attributes =
|
||||
name:/[^\n#]*?(?= +-- | | *\n| *#)/
|
||||
name:/[^\n#]*?(?= +-- | | €| *\n| *#)/
|
||||
[ s '--' ~ s description:/[^\n#]*?(?= | *\n| *#)/ ]
|
||||
[ / {2,}/ ~
|
||||
[ / +/ ~
|
||||
[ {[ s ] ('{' tags+:identifier '}')} / +|$/ ]
|
||||
[ price:price ]
|
||||
]
|
||||
|
|
Loading…
Reference in a new issue