pub-solar/pub.solar
5
2
Fork 2
Code Issues Pull requests Packages Projects Releases Wiki Activity

Compare commits

base: pub-solar:af0effe5d38c67d4143731b3587939efbdab4631
Branches Tags
pub-solar:main
..
compare: pub-solar:815f5a952d8ed6452d044e9d71cc03c78a41d2e6
Branches Tags
pub-solar:main

6 commits
af0effe5d3 ... 815f5a952d

Author SHA1 Message Date
Benjamin Bädorf 815f5a952d
Merge branch 'main' of git.pub.solar:pub-solar/pub.solar
Some checks failed
continuous-integration/drone/push Build is failing
Details
2023-01-29 20:41:46 +01:00
Benjamin Bädorf 637038f662
Add funding text in about 2023-01-29 20:41:33 +01:00
teutat3s 12a24477b4
Deploy website to flora-6
All checks were successful
continuous-integration/drone/push Build is passing
Details 
Bump deno to 1.29.4
 2023-01-29 17:15:16 +01:00
teutat3s 2f3adf0f3a
Bump flake.lock 2023-01-29 17:14:55 +01:00
b12f d2a9530054 Merge pull request 'Revert "Add banner to announce that some services are down"' (#5) from hut/pub.solar:remove-banner into main
Some checks failed
continuous-integration/drone/push Build is failing
Details 
Reviewed-on: #5
 2023-01-28 23:52:29 +01:00
yuni dd5d69002a Revert "Add banner to announce that some services are down"
Some checks failed
continuous-integration/drone/pr Build is failing
Details 
This reverts commit 68fd37a3fa.
 2023-01-28 23:38:06 +01:00
6 changed files with 57 additions and 52 deletions
Show stats Expand all files Collapse all files

8
.drone.yml
View file

@ -8,7 +8,7 @@ steps:
events: events:
- push - push
- pull_request - pull_request
image: denoland/deno:alpine-1.26.2 image: denoland/deno:alpine-1.29.4
commands: commands:
- deno task build - deno task build
@ -20,14 +20,14 @@ steps:
- main - main
image: appleboy/drone-scp image: appleboy/drone-scp
settings: settings:
host: pub.solar host: flora-6.pub.solar
port: 2020 port: 22
username: username:
from_secret: ps_ssh_user from_secret: ps_ssh_user
key: key:
from_secret: ps_ssh_key from_secret: ps_ssh_key
source: source:
- ./_site/* - ./_site/*
target: /srv/pub.solar/ target: /srv/www/pub.solar/
overwrite: true overwrite: true
strip_components: 1 strip_components: 1

2
_includes/layouts/default.tsx
View file

@ -47,8 +47,6 @@ export default ({
dangerouslySetInnerHTML={{ __html: md(content.en) }} dangerouslySetInnerHTML={{ __html: md(content.en) }}
className="ps-page--section-contents" className="ps-page--section-contents"
></div> ></div>
{showHakkenDates ? <HakkenDates lang="en" className="ps-page--section-contents" /> : null}
</section> </section>
<section <section

5
_includes/layouts/homepage.tsx
View file

@ -24,11 +24,6 @@ export default ({
<body className="ps-main"> <body className="ps-main">
<Background /> <Background />
<main className="ps-main--page ps-page ps-page_home"> <main className="ps-main--page ps-page ps-page_home">
<section className="ps-page--banner">
<div className="ps-page--banner-contents">
⚠️ A few of our services are currently down due to an incident in one of our datacenters. We hope to bring them back up soon.
</div>
</section>
{links.map(({ href, title, openInNewTab }) => {links.map(({ href, title, openInNewTab }) =>
<a <a
href={href} href={href}

28
_includes/styles/page.scss
View file

@ -21,34 +21,6 @@
flex-wrap: wrap; flex-wrap: wrap;
} }
&--banner {
border: 12px solid black;
width: 100%;
margin-left: 2vw;
margin-right: 2vw;
background: white;
word-break: break-word;
}
&--banner-contents {
color: var(--foreground);
background: white;
text-decoration: none;
text-align: center;
font-weight: 500;
font-size: 8rem;
line-height: 1em;
padding: 0.2vw;
margin: 2vw;
@media screen and (min-width: 700px) {
font-size: 4rem;
}
@media screen and (min-width: 1000px) {
font-size: 2rem;
}
}
&--section { &--section {
border: 12px solid black; border: 12px solid black;
margin-top: 10vh; margin-top: 10vh;

40
about.yml
View file

@ -35,6 +35,26 @@ content:
Feel like joining in? Know what to do? Don't know what to do? Just send the crew a message. We're looking forward to hearing from you! Feel like joining in? Know what to do? Don't know what to do? Just send the crew a message. We're looking forward to hearing from you!
## Financing
Most of the cloud space is offered to us free of charge by greenbaum.cloud. We currently pay for the rest of the infrastructure out of our own pockets (like the domain name).
This situation is not long-term sustainable, and we're currently working on founding an e.V. and having solid financing. We'd of course welcome anyone wanting to help and participate!
### Donate via IBAN
Jhonas Wernery
DE97430609674093197700
GLS Bank
### Donate via Liberapay
[Right here](https://liberapay.com/pub.solar/)
### Donate via PayPal
[Right here](https://www.paypal.com/paypalme/pubsolar)
## Imprint ## Imprint
pub.solar n.e.V. pub.solar n.e.V.
@ -97,6 +117,26 @@ content:
Klingt nach deinem Ding? Schon ne Ahnung was du machen willst? Keine Ahnung was du machen willst? Schick die Crew ne Nachricht, wir freuen uns von dir zu hören! Klingt nach deinem Ding? Schon ne Ahnung was du machen willst? Keine Ahnung was du machen willst? Schick die Crew ne Nachricht, wir freuen uns von dir zu hören!
## Finanzierung
Der größte Teil unserer RZ-Ausstattung wird umsonst von greenbaum.cloud gespendet. Die anderen kosten zahlen wir momentan aus eigener Tasche (wie der Domainname).
Diese Situation ist nicht nachhaltig, also arbeiten wir aktuell daran einen e.V. zu gründen und die Finanzierung zu sichern.
### Per IBAN spenden
Jhonas Wernery
DE97430609674093197700
GLS Bank
### Per Liberapay spenden
[Right here](https://liberapay.com/pub.solar/)
### Per PayPal spenden
[Right here](https://www.paypal.com/paypalme/pubsolar)
## Impressum ## Impressum
pub.solar n.e.V. pub.solar n.e.V.

26
flake.lock
View file

@ -10,11 +10,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1663445644, "lastModified": 1671489820,
"narHash": "sha256-+xVlcK60x7VY1vRJbNUEAHi17ZuoQxAIH4S4iUFUGBA=", "narHash": "sha256-qoei5HDJ8psd1YUPD7DhbHdhLIT9L2nadscp4Qk37uk=",
"owner": "numtide", "owner": "numtide",
"repo": "devshell", "repo": "devshell",
"rev": "e3dc3e21594fe07bdb24bdf1c8657acaa4cb8f66", "rev": "5aa3a8039c68b4bf869327446590f4cdf90bb634",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -25,11 +25,11 @@
}, },
"flake-utils": { "flake-utils": {
"locked": { "locked": {
"lastModified": 1659877975, "lastModified": 1667395993,
"narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -40,11 +40,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1665449268, "lastModified": 1674641431,
"narHash": "sha256-cw4xrQIAZUyJGj58Dp5VLICI0rscd+uap83afiFzlcA=", "narHash": "sha256-qfo19qVZBP4qn5M5gXc/h1MDgAtPA5VxJm9s8RUAkVk=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "285e77efe87df64105ec14b204de6636fb0a7a27", "rev": "9b97ad7b4330aacda9b2343396eb3df8a853b4fc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -75,11 +75,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1665580466, "lastModified": 1669581047,
"narHash": "sha256-q8kVIE3XaOSCVl7oqkaKs2LDEbBcZRIzlnSG8PIKRQ0=", "narHash": "sha256-qs2VUUCCkWlc+5KvP/Vh2ToLKMkCjAws47bVT6rilG8=",
"ref": "main", "ref": "main",
"rev": "70d759b6d8b5e076bee6a28255614ab3d75f6763", "rev": "341aa68b667a8fb9b77f8af319b7439e82c78793",
"revCount": 49, "revCount": 53,
"type": "git", "type": "git",
"url": "https://git.greenbaum.cloud/dev/tritonshell" "url": "https://git.greenbaum.cloud/dev/tritonshell"
}, },