Merge branch 'senpai' into dev

This commit is contained in:
Daniel Kluge 2022-12-29 18:17:30 +01:00
commit 5bd9dd4e2b
4 changed files with 13 additions and 19 deletions

View File

@ -1,6 +1,6 @@
# Frontpage # Frontpage
[![Read the blog entry at c0ntroller.de](https://c0ntroller.de/img/read-blog.svg)](https://c0ntroller.de/#/project/homepage) [![Read the blog entry at c0ntroller.de](https://c0ntroller.de/img/read-blog.svg)](https://c0ntroller.de/blog/project/terminal)
| Stable | Dev | Stable | Dev
| ------ | --- | ------ | ---

View File

@ -13,15 +13,12 @@ services:
labels: labels:
- "traefik.enable=true" - "traefik.enable=true"
- "traefik.docker.network=traefik" - "traefik.docker.network=traefik"
- "traefik.http.routers.website-dev.entrypoints=web" - "traefik.http.routers.website-dev.entrypoints=websecure"
- "traefik.http.routers.website-dev.rule=Host(`dev.c0ntroller.de`)" - "traefik.http.routers.website-dev.rule=Host(`dev.c0ntroller.de`)"
- "traefik.http.routers.website-dev.middlewares=http-to-https@file" - "traefik.http.routers.website-dev.middlewares=secHeaders@file"
- "traefik.http.routers.website-dev-secure.entrypoints=websecure" - "traefik.http.routers.website-dev.tls=true"
- "traefik.http.routers.website-dev-secure.rule=Host(`dev.c0ntroller.de`)" - "traefik.http.routers.website-dev.tls.certresolver=le"
- "traefik.http.routers.website-dev-secure.middlewares=secHeaders@file" - "traefik.http.routers.website-dev.service=website-dev"
- "traefik.http.routers.website-dev-secure.tls=true"
- "traefik.http.routers.website-dev-secure.tls.certresolver=le"
- "traefik.http.routers.website-dev-secure.service=website-dev"
- "traefik.http.services.website-dev.loadbalancer.server.port=3000" - "traefik.http.services.website-dev.loadbalancer.server.port=3000"
environment: environment:
- IS_DEV_ENV=true - IS_DEV_ENV=true

View File

@ -13,15 +13,12 @@ services:
labels: labels:
- "traefik.enable=true" - "traefik.enable=true"
- "traefik.docker.network=traefik" - "traefik.docker.network=traefik"
- "traefik.http.routers.website-stable.entrypoints=web" - "traefik.http.routers.website-stable.entrypoints=websecure"
- "traefik.http.routers.website-stable.rule=Host(`c0ntroller.de`) || Host(`www.c0ntroller.de`)" - "traefik.http.routers.website-stable.rule=Host(`c0ntroller.de`) || Host(www.c0ntroller.de`)"
- "traefik.http.routers.website-stable.middlewares=http-to-https@file" - "traefik.http.routers.website-stable.middlewares=secHeaders@file"
- "traefik.http.routers.website-stable-secure.entrypoints=websecure" - "traefik.http.routers.website-stable.tls=true"
- "traefik.http.routers.website-stable-secure.rule=Host(`c0ntroller.de`) || Host(www.c0ntroller.de`)" - "traefik.http.routers.website-stable.tls.certresolver=le"
- "traefik.http.routers.website-stable-secure.middlewares=secHeaders@file" - "traefik.http.routers.website-stable.service=website-stable"
- "traefik.http.routers.website-stable-secure.tls=true"
- "traefik.http.routers.website-stable-secure.tls.certresolver=le"
- "traefik.http.routers.website-stable-secure.service=website-stable"
- "traefik.http.services.website-stable.loadbalancer.server.port=3000" - "traefik.http.services.website-stable.loadbalancer.server.port=3000"
environment: environment:
- IS_DEV_ENV=true - IS_DEV_ENV=true

View File

@ -108,7 +108,7 @@ const Me: NextPage = () => {
</div> </div>
<h2>Social Media</h2> <h2>Social Media</h2>
<div className={styles.socials}> <div className={styles.socials}>
{socials("2em").map((social, i) => {socials("2em").filter((social) => social.name !== "PGP Key").map((social, i) =>
<a key={i} href={social.url} target="_blank" rel="noreferrer" className="nocolor"> <a key={i} href={social.url} target="_blank" rel="noreferrer" className="nocolor">
{social.icon} {social.icon}
</a> </a>