tildetown
/
tildetown-scripts
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

yolocfg

master
nathaniel smith 2015-10-15 21:58:54 +00:00
parent 0b90e84577
commit 3a9afbcb9e
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
tildetown/app.py
View File

@ -27,11 +27,6 @@ SITE_NAME = 'tilde.town'
app = Flask('~cgi') app = Flask('~cgi')
@lru_cache(maxsize=32)
def cfg(k):
conf = ConfigFactory.parse_file('cfg.conf')
return conf[k]
@lru_cache(maxsize=32) @lru_cache(maxsize=32)
def site_context(): def site_context():
return get_data() return get_data()
@ -98,10 +93,10 @@ def send_email(data):
request_type = data['type'] request_type = data['type']
desc = request.form['desc'] desc = request.form['desc']
response = requests.post( response = requests.post(
cfg('mailgun_url'), app.config['MAILGUN_URL'],
auth=("api", cfg('mailgun_key')), auth=("api", app.config['MAILGUN_KEY']),
data={"from": "root@tilde.town", data={"from": "root@tilde.town",
"to": cfg('trello'), "to": app.config['TRELLO_EMAIL'],
"subject": "{} from {} <{}>".format(request_type, name, email), "subject": "{} from {} <{}>".format(request_type, name, email),
"text": desc}) "text": desc})
@ -121,13 +116,15 @@ def post_helpdesk():
return redirect('/helpdesk?status={}&desc={}'.format(status, desc)) return redirect('/helpdesk?status={}&desc={}'.format(status, desc))
if __name__ == '__main__': if __name__ == '__main__':
if len(argv) == 2:
data_dir = argv[1]
else:
data_dir = mkdtemp()
app.config['DEBUG'] = True app.config['DEBUG'] = True
app.config['DATA_DIR'] = data_dir # tension between this and cfg function...
conf = ConfigFactory.parse_file('cfg.conf')
app.config['DATA_DIR'] = conf['guestbook_dir']
app.config['TRELLO_EMAIL'] = conf['trello_email']
app.config['MAILGUN_URL'] = conf['mailgun_url']
app.config['MAILGUN_KEY'] = conf['mailgun_key']
print("Running with data_dir=", app.config['DATA_DIR']) print("Running with data_dir=", app.config['DATA_DIR'])