Merge pull request #4 from offen/development

update mail and sm links
2024-12-26 14:50:20 +01:00 · 2019-10-20 09:01:53 +02:00 · 2019-10-20 09:01:53 +02:00 · cb36d77787
commit cb36d77787
parent 36f555c086 171c770988
11 changed files with 83 additions and 22 deletions
--- a/.editorconfig
+++ b/.editorconfig
@ -10,6 +10,9 @@ insert_final_newline = true
 trim_trailing_whitespace = true
 indent_style = tab

+[*.md]
+trim_trailing_whitespace = false
+
 [{*.js,*.yml,*.md,Gopkg.toml,package.json,*.html,Dockerfile.*,Dockerrun.*}]
 indent_style = space
 indent_size = 2
--- a/README.md
+++ b/README.md
@ -1,10 +1,9 @@
 # website
 [![CircleCI](https://circleci.com/gh/offen/website/tree/master.svg?style=svg)](https://circleci.com/gh/offen/website/tree/master)
-[![Patreon](https://img.shields.io/static/v1.svg?label=patreon&message=donate&color=e85b46)](https://www.patreon.com/offen)

 > The www.offen.dev website

-This repository contains the source code for the <www.offen.dev> website, as well as the code needed for running and extending an instance of `offen/offen`.
+This repository contains the source code for the <https://www.offen.dev> website, as well as the code needed for running and extending an instance of `offen/offen` on the same domain.

 ---

@ -30,7 +29,7 @@ You can test your setup by starting the application:
 $ docker-compose up
 ```

-which should enable you to access the homepage at <http://localhost:8000/> and use the `auditorium` at <http://localhost:8000/>
+which should enable you to access the homepage at <http://localhost:8000/> and use the wrapped `auditorium` at <http://localhost:8000/auditorium>

 ### License

--- a/build/nginx.conf
+++ b/build/nginx.conf
@ -28,10 +28,15 @@ http {
 		autoindex on;
 		root /www/data;
 		expires $expires;
+		proxy_hide_header Content-Security-Policy;
 		add_header Content-Security-Policy $csp;
+		proxy_hide_header Strict-Transport-Security;
 		add_header Strict-Transport-Security 'max-age=604800; includeSubDomains';
+		proxy_hide_header Referrer-Policy;
 		add_header Referrer-Policy 'origin-when-cross-origin';
+		proxy_hide_header X-Content-Type-Options;
 		add_header X-Content-Type-Options 'nosniff';
+		proxy_hide_header X-XSS-Protection;
 		add_header X-XSS-Protection '1; mode=block';

 		location /api/ {
--- a/build/robots.txt.production
+++ b/build/robots.txt.production
@ -1,3 +1,4 @@
 User-agent: *
 Disallow: /vault/
 Disallow: /auditorium/
+Disallow: /legal-notice/
--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -18,11 +18,11 @@ services:
      - ./bootstrap.yml:/bootstrap.yml
    environment:
      POSTGRES_CONNECTION_STRING: postgres://postgres:develop@server_database:5432/postgres?sslmode=disable
-      PORT: 8080
      DEVELOPMENT: '1'
-      COOKIE_EXCHANGE_SECRET: 3P+w6QetKO3Kn8h1YyRlCw==
+      PORT: 8080
+      COOKIE_EXCHANGE_SECRET: 8jeKYbbnywoYIZznu4HffQ==
      EVENT_RETENTION_PERIOD: 4464h
-      ACCOUNT_USER_EMAIL_SALT: JuhbRA4lCdo8rt5qVdLpk3==
+      ACCOUNT_USER_EMAIL_SALT: eypctS7SVKM1Ureb61db5Q==
      SECURE_COOKIE: 'off'
    depends_on:
      - server_database
--- a/homepage/content/pages/about.md
+++ b/homepage/content/pages/about.md
@ -24,6 +24,4 @@ We are happy to work with [NLnet Foundation][nlnet-foundation]{: target="_blank"

 *Feel free to contact us with any kind of feedback.* From criticism and praise to contributions or support, everything is welcome. Get in touch.

-[mail@offen.dev][mail@offen.dev]
-
-[mail@offen.dev]: mailto:mail@offen.dev
+[hioffen@posteo.de](mailto:hioffen@posteo.de) [[GPG Key]](/theme/74B041E23DB29D552644CEB1B18C633D6967FE3F.asc){: target="_blank"} 
--- a/homepage/content/pages/legal-notice.md
+++ b/homepage/content/pages/legal-notice.md
@ -11,8 +11,8 @@ Torfstr. 22
 13353 Berlin

 ### Contact Information
-E-Mail: [mail@offen.dev](mailto:mail@offen.dev)  
-Internet address: [www.offen.dev](https://www.offen.dev/)  
+E-Mail: [hioffen@posteo.de](mailto:hioffen@posteo.de)  
+Internet address: [www.offen.dev](https://www.offen.dev/)

 ### Graphics and Image Sources
 NLNet Logo [https://nlnet.nl/logo/](https://nlnet.nl/logo/){: target="_blank"}
--- a/homepage/pelicanconf.py
+++ b/homepage/pelicanconf.py
@ -26,9 +26,6 @@ THEME = './theme'
 # Delete the output directory before generating new files.
 DELETE_OUTPUT_DIRECTORY = True

-PLUGIN_PATHS = ['./plugins']
-PLUGINS = ['assets']
-
 # dont create following standard pages
 AUTHORS_SAVE_AS = None
 ARCHIVES_SAVE_AS = None
@ -38,8 +35,15 @@ TAGS_SAVE_AS = None
 # keep this for access to page variable
 DIRECT_TEMPLATES = []

+PLUGIN_PATHS = ['./plugins']
+PLUGINS = ['assets']
+
+
 GITHUB_ORG = 'https://github.com/offen'
-CONTACT_EMAIL = 'mail@offen.dev'
-PATREON_URL = 'https://www.patreon.com/bePatron?u=21484999'
+CONTACT_EMAIL = 'hioffen@posteo.de'
+GPG_KEY_FILE = '74B041E23DB29D552644CEB1B18C633D6967FE3F.asc'
+PATREON_URL = 'https://www.patreon.com/offen'
+LINKEDIN_URL = 'https://www.linkedin.com/company/hioffen'
+TWITTER_URL = 'https://twitter.com/hioffen'

 OFFEN_ACCOUNT_ID = '9b63c4d8-65c0-438c-9d30-cc4b01173393'
--- a/homepage/theme/static/74B041E23DB29D552644CEB1B18C633D6967FE3F.asc
+++ b/homepage/theme/static/74B041E23DB29D552644CEB1B18C633D6967FE3F.asc
@ -0,0 +1,41 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+gt3fc6F0X6bR
+=hB6m
+-----END PGP PUBLIC KEY BLOCK-----
--- a/homepage/theme/static/css/style.css
+++ b/homepage/theme/static/css/style.css
@ -145,7 +145,7 @@ CARDS
  margin: 0 0 2px 0;
 }
 .footer-card:nth-child(1),
-.footer-card:nth-child(2) {
+.footer-card:nth-child(3) {
  margin: 0 0 20px 0;
 }
 /* Mobile Styles */
@ -184,12 +184,13 @@ CARDS
    justify-content: space-between;
  }
  .footer-card:nth-child(1),
-  .footer-card:nth-child(2) {
+  .footer-card:nth-child(2),
+  .footer-card:nth-child(3) {
    flex-grow: 1;
  }
-  .footer-card:nth-child(3) {
+  .footer-card:nth-child(4) {
    text-align: right;
-    flex-grow: 10;
+    flex-grow: 8;
  }
 }

--- a/homepage/theme/templates/base.html
+++ b/homepage/theme/templates/base.html
@ -121,7 +121,8 @@
      </div>
      <div class="footer-card">
        <p>
-          <a href="mailto:{{CONTACT_EMAIL}}">Contact</a>
+          <a href="mailto:{{CONTACT_EMAIL}}">{{CONTACT_EMAIL}}</a>
+          <a target="_blank" href="/theme/{{GPG_KEY_FILE}}">[GPG Key]</a>
        </p>
        <p>
          <a href="{{GITHUB_ORG}}" rel="noopener" target="_blank">GitHub</a>
@ -129,8 +130,16 @@
        <p>
          <a href="{{PATREON_URL}}" rel="noopener" target="_blank">Patreon</a>
        </p>
+      </div>
+      <div class="footer-card">
        <p>
-          <a href="/legal-notice/" rel="noopener">Legal Notice</a>
+          <a href="{{LINKEDIN_URL}}" rel="noopener" target="_blank">LinkedIn</a>
+        </p>
+        <p>
+          <a href="{{TWITTER_URL}}" rel="noopener" target="_blank">Twitter</a>
+        </p>
+        <p>
+          <a href="/legal-notice/">Legal Notice</a>
        </p>
      </div>
      <div class="footer-card">