From 0656abd0cbdc077c9667bf8d639140d79f5d71d8 Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Thu, 2 Apr 2020 21:54:20 +0200 Subject: [PATCH] added a privacy policy --- .htaccess | 1 + Jenkinsfile | 12 ++++- actaddmanual/index.js | 1 + index.html | 93 +++++++++++++++--------------------- node/blog.js | 106 ++++++++++++++++++------------------------ node/rss.js | 26 +++-------- node/server.js | 3 -- node/sitemap.js | 100 ++++++++++++++++++--------------------- scripts/cookies.js | 6 +-- scripts/main.js | 8 ++-- style/style.css | 6 --- 11 files changed, 152 insertions(+), 210 deletions(-) delete mode 100644 node/server.js diff --git a/.htaccess b/.htaccess index 8a85de8..c85c396 100644 --- a/.htaccess +++ b/.htaccess @@ -13,6 +13,7 @@ RewriteRule ^actaddlicense/?$ "https://github.com/Ellpeck/ActuallyAdditions/blob RewriteRule ^actadd/?$ "https://minecraft.curseforge.com/projects/actually-additions" [R=301,L] RewriteRule ^projects/?$ "https://ellpeck.de/#projects" [NE,R=301,L] RewriteRule ^impressum/?$ "https://ellpeck.de/#impressum" [NE,R=301,L] +RewriteRule ^privacy/?$ "https://ellpeck.de/#privacy" [NE,R=301,L] RewriteRule ^mc/?$ "https://ellpeck.de/minecraft-stuff" [R=301,L] RewriteRule ^minecraft-stuff/?$ "https://ellpeck.de/projects" [R=301,L] RewriteRule ^yt/?$ "https://www.youtube.com/c/ellpeck" [R=301,L] diff --git a/Jenkinsfile b/Jenkinsfile index 807c419..9b44f46 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -10,6 +10,16 @@ pipeline { git pull''' } } - + stage('Node') { + when { + branch 'master' + } + steps { + sh '''cd /var/www/ellpeck/node +node blog.js +node sitemap.js +node rss.js''' + } + } } } \ No newline at end of file diff --git a/actaddmanual/index.js b/actaddmanual/index.js index 55c9347..3cc5004 100644 --- a/actaddmanual/index.js +++ b/actaddmanual/index.js @@ -49,6 +49,7 @@ function populateManual(lang) { sidebar.append("
"); sidebar.append(`Main Site`) sidebar.append(`Impressum`); + sidebar.append(`Privacy`); sidebar.append(`© Ellpeck`); sidebar.append("
"); diff --git a/index.html b/index.html index be2f925..755b815 100644 --- a/index.html +++ b/index.html @@ -82,6 +82,7 @@
+
@@ -166,12 +167,13 @@
+
- © 2018-2019 Ellpeck – Impressum + © 2018-2019 Ellpeck – Impressum – Privacy
@@ -179,6 +181,7 @@
+ +
- If you don't know what this is, read up on it here or just ignore it. -
+

Julian Schubert
Kastanienweg 27
52074 Aachen -
Telefon: 0241 45093753 +

+

+ Telefon: 0241 45093753
E-Mail: me@ellpeck.de -

-

- Verantwortlich für den Inhalt (gem. § 55 Abs. 2 RStV): -
Siehe oben

+

Die obenstehende Person ist ebenfalls verantwortlich für den Inhalt (gem. § 55 Abs. 2 RStV).

+
+ + + -

Disclaimer – rechtliche Hinweise

-

§ 1 Haftungsbeschränkung

+ +