From a097e314a0cb63b5f7ceadf965df9c50381d1ac8 Mon Sep 17 00:00:00 2001
From: Sergiusz Bazanski <q3k@q3k.org>
Date: Mon, 26 Feb 2018 10:03:33 +0000
Subject: [PATCH] Add hackerspace name config option

Also move config.py to config.py.dist for distribution purposes :)
---
 krb5.conf                            | 10 ++++++----
 webapp/__init__.py                   |  4 ++++
 webapp/{config.py => config.py.dist} | 12 +++++++-----
 webapp/templates/basic.html          |  4 ++--
 4 files changed, 19 insertions(+), 11 deletions(-)
 rename webapp/{config.py => config.py.dist} (80%)

diff --git a/krb5.conf b/krb5.conf
index 65ed703..5532156 100644
--- a/krb5.conf
+++ b/krb5.conf
@@ -28,12 +28,14 @@
 		admin_server = kerberos.mit.edu
 		default_domain = mit.edu
 	}
-	TOG.IE = {
-		kdc = duckula.tog.ie
-		admin_server = duckula.tog.ie
-		sasl-realm = TOG.IE
+   	HACKERSPACE.PL = {
+		admin_server = hackerspace.pl
+		kdc = hackerspace.pl
+		default_domain = hackerspace.pl
+		sasl-realm = HACKERSPACE.PL
 	}
 
+
 [domain_realm]
 	.mit.edu = ATHENA.MIT.EDU
 	mit.edu = ATHENA.MIT.EDU
diff --git a/webapp/__init__.py b/webapp/__init__.py
index a57538b..0aa8937 100644
--- a/webapp/__init__.py
+++ b/webapp/__init__.py
@@ -19,6 +19,10 @@ from webapp import validation, pools, config
 def inject_readable():
     return dict(readable_names=config.readable_names)
 
+@app.context_processor
+def inject_hackerspace_name():
+    return dict(hackerspace_name=config.hackerspace_name)
+
 @app.template_filter('first')
 def ldap_first(v):
     return v and v[0]
diff --git a/webapp/config.py b/webapp/config.py.dist
similarity index 80%
rename from webapp/config.py
rename to webapp/config.py.dist
index cd95340..2fae916 100644
--- a/webapp/config.py
+++ b/webapp/config.py.dist
@@ -1,12 +1,14 @@
 # -*- coding: utf-8 -*-
 import flask_wtf
 import wtforms
-ldap_url = 'ldap://ldap.tog.ie'
-dn_format = "uid=%s,ou=people,dc=tog,dc=ie" 
+ldap_url = 'ldap://ldap.hackerspace.pl'
+dn_format = "uid=%s,ou=people,dc=hackerspace,dc=pl" 
 
-admin_dn = 'cn=ldapweb,ou=Services,dc=tog,dc=ie'
+admin_dn = 'cn=ldapweb,ou=Services,dc=hackerspace,dc=pl'
 admin_pw = 'changeme'
 
+hackerspace_name = 'Warsaw Hackerspace'
+
 readable_names = {
     'givenname': u'Given Name',
     'surname': u'Surname',
@@ -49,8 +51,8 @@ default_field = (wtforms.fields.StringField, {})
 fields = { 'telephonenumber': (wtforms.fields.StringField, {'validators': [wtforms.validators.Regexp(r'[+0-9 ]+')]})}
 
 kadmin_passwd = True
-kadmin_principal = "ldapweb/admin@TOG.IE"
+kadmin_principal = "kadmin/admin@HACKERSPACE.PL"
 kadmin_keytab = "/app/mount/keytab"
-kadmin_principal_map = "{}@TOG.IE"
+kadmin_principal_map = "{}@HACKERSPACE.PL"
 
 TOKEN_LENGTH = 32
diff --git a/webapp/templates/basic.html b/webapp/templates/basic.html
index 503b6cd..eb9009f 100644
--- a/webapp/templates/basic.html
+++ b/webapp/templates/basic.html
@@ -4,7 +4,7 @@
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>{% block title %}Hackerspace Membership Manager{% endblock %}</title>
+    <title>{% block title %}{{ hackerspace_name }} Membership Manager{% endblock %}</title>
     <link href="/static/css/bootstrap.min.css" rel="stylesheet">
     <link href="/static/css/bootstrap-theme.min.css" rel="stylesheet">
     <style type="text/css">
@@ -30,7 +30,7 @@ body {
                            <span class="icon-bar"></span>
                            <span class="icon-bar"></span>
                        </button>
-                       <a class="navbar-brand" href="#">Tog Membership Manager</a>
+                       <a class="navbar-brand" href="#">{{ hackerspace_name }} Membership Manager</a>
                    </div>
                    <div id="navbar" class="navbar-collapse collapse">
                        <ul class="nav navbar-nav navbar-right">