Merge branch 'multi-deployment' of dl6tom.de:public/ticketfrei into multi-deployment

config.toml.example

@@ -10,8 +10,8 @@ contact = "b3yond@riseup.net"
 
 [mail]
 mailserver = "smtp.riseup.net"
-user = "nbgticketfrei"
-passphrase = "5MUIGw,GmSj)t@xW!jixq=b0U+@SJ{K{"
+user = "user"
+passphrase = "sup3rs3cur3"
 
 [logging]
 # The directory where logs should be stored.

frontend.py

@@ -115,8 +115,8 @@ def twitter_callback(user):
     """
     # twitter passes the verifier/oauth token secret in a GET request.
     verifier = request.query('oauth_verifier')
-    consumer_key = config["tapp"]["consumer_key"]
-    consumer_secret = config["tapp"]["consumer_secret"]
+    consumer_key = config["twitter"]["consumer_key"]
+    consumer_secret = config["twitter"]["consumer_secret"]
     auth = tweepy.OAuthHandler(consumer_key, consumer_secret)
     request_token = user.get_request_token
     auth.request_token = {"oauth_token": request_token,

template/propaganda.tpl

@@ -1,42 +1,58 @@
 % rebase('template/wrapper.tpl')
 % include('template/login-plain.tpl')
 <h1>Features</h1>
-<p>sum is simply dummy text of the printing and typesetting
-    industry. Lorem Ipsum has been the industry's standard
-    dummy text ever since the 1500s, when an unknown printer
-    took a galley of type and scrambled it to make a type
-    specimen book. It has survived not only five centuries,
-    but also the leap into electronic typesetting, remaining
-    essentially unchanged. It was popularised in the 1960s
-    with the release of Letraset sheets containing Lorem
-    Ipsum passages, and more recently with desktop publishing
-    software like Aldus PageMaker including versions of Lorem
-    Ipsum.</p>
+<p>
+    Don't pay for public transport. Instead, warn each other
+    from ticket controllers! With Ticketfrei, you can turn
+    your city into a paradise for fare dodgers.
+</p>
+<p>
+    Ticketfrei is a Twitter, Mastodon, and E-Mail bot. Users
+    can help each other by tweeting, tooting, or mailing,
+    when and where they spot a ticket controller.
+</p>
+<p>
+    Ticketfrei automatically retweets, boosts, and remails
+    those controller reports, so others can see them. If there
+    are ticket controllers around, they can still buy a ticket
+    - but if the coast is clear, they can save the money.
+</p>
 <h2>How to get Ticketfrei to my city?</h2>
-<p>sum is simply dummy text of the printing and typesetting
-    industry. Lorem Ipsum has been the industry's standard
-    dummy text ever since the 1500s, when an unknown printer
-    took a galley of type and scrambled it to make a type
-    specimen book. It has survived not only five centuries,
-    but also the leap into electronic typesetting, remaining
-    essentially unchanged. It was popularised in the 1960s
-    with the release of Letraset sheets containing Lorem
-    Ipsum passages, and more recently with desktop publishing
-    software like Aldus PageMaker including versions of Lorem
-    Ipsum.</p>
+<p>
+    We try to make it as easy as possible to spread Ticketfrei
+    to other citys. There are four basic steps:
+</p>
+<ul>
+    <li>Create a Twitter and/or a Mastodon account.</li>
+    <li>Register on this website to create a bot for your city.</li>
+    <li>Log in with the social media accounts you want to
+    use for Ticketfrei.</li>
+    <li>Promote the service! Ticketfrei only works if there is
+    a community for it. Fortunately, we prepared some material
+    you can use:
+    <a href="https://github.com/b3yond/ticketfrei/tree/master/promotion" target="_blank">https://github.com/b3yond/ticketfrei/tree/master/promotion</a></li>
+</ul>
 % include('template/register-plain.tpl')
 <h2>Our Mission</h2>
-<p>Contrary to popular belief, Lorem Ipsum is not simply random
-    text. It has roots in a piece of classical Latin literature
-    from 45 BC, making it over 2000 years old. Richard
-    McClintock, a Latin professor at Hampden-Sydney College in
-    Virginia, looked up one of the more obscure Latin words,
-    consectetur, from a Lorem Ipsum passage, and going through
-    the cites of the word in classical literature, discovered
-    the undoubtable source. Lorem Ipsum comes from sections
-    1.10.32 and 1.10.33 of "de Finibus Bonorum et Malorum"
-    (The Extremes of Good and Evil) by Cicero, written in 45
-    BC. This book is a treatise on the theory of ethics, very
-    popular during the Renaissance. The first line of Lorem
-    Ipsum, "Lorem ipsum dolor sit amet..", comes from a line
-    in section 1.10.32.</p>
+<p>
+    Public transportation is meant to provide an easy and
+    time-saving way to move within a region while being
+    affordable for everybody. Unfortunately, this is not the
+    case. Ticketfrei's approach is to enable people to
+    reclaim public transportation.
+</p>
+<p>
+    On short term we want to do this by helping users to avoid 
+    controllers and fines - on long term by pressuring public 
+    transportation companies to offer their services free of 
+    charge, financed by the public. 
+</p>
+<p>
+    Because with Ticketfrei you're able to use trains and 
+    subways for free anyway. Take part and create a new 
+    understanding of what public transportation should look
+    like!
+</p>
+    
+    
+