From 0eac638fa60e3ae62b83d758332704a0391fc7fe Mon Sep 17 00:00:00 2001 From: Luke Murphy Date: Mon, 1 Jul 2019 12:38:50 +0200 Subject: [PATCH 1/6] Add missing dependency --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 1d9799d..3061f3c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ Markdown==3.1.1 +beautifulsoup4==4.7.1 invoke==1.2.0 -livereload==2.6.1 pelican==4.0.1 From de34ed1a500817a71313570bdd7d82ae6e544c88 Mon Sep 17 00:00:00 2001 From: Luke Murphy Date: Mon, 1 Jul 2019 12:39:00 +0200 Subject: [PATCH 2/6] Remove livereload stuff (not working) --- README.md | 9 --------- tasks.py | 9 --------- 2 files changed, 18 deletions(-) diff --git a/README.md b/README.md index 162cc20..76fc16d 100644 --- a/README.md +++ b/README.md @@ -51,19 +51,10 @@ Then the site is available at the following URL: While working on the site, you can run the following: -```bash -$ invoke livereload -``` - -And then the Pelican development server will automatically reload -when you make changes. It is also possible to use: - ```bash $ pelican --autoreload --listen --relative-urls ``` -However, this will not automatically refresh your browser page. - ### Writing drafts Use `Status: draft` in the article metadata. When the site is generated, the diff --git a/tasks.py b/tasks.py index 256da24..f510665 100644 --- a/tasks.py +++ b/tasks.py @@ -5,7 +5,6 @@ import shutil import sys from invoke import task -from livereload import Server from pelican.server import ComplexHTTPRequestHandler, RootedHTTPServer CONFIG = { @@ -76,11 +75,3 @@ def publish(c): # TODO: use generation and rsync here for publishing # also update README.md "Deploying the site" instructions c.run('git push origin master') - - -@task -def livereload(c): - """Get automatic live reloading when hacking on the site""" - server = Server() - server.watch(CONFIG['content_path'], lambda: build(c)) - server.serve(root=CONFIG['deploy_path'], port=CONFIG['port']) From 62ae34527e33eab71f9a06f9f95471466c66ce9c Mon Sep 17 00:00:00 2001 From: Luke Murphy Date: Mon, 1 Jul 2019 12:39:12 +0200 Subject: [PATCH 3/6] Also clone submodules --- README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.md b/README.md index 76fc16d..10de788 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,12 @@ The new homebrewserver.club website. ## Build the site locally +### Get a local copy + +```bash +$ git clone --recurse-submodules https://git.vvvvvvaria.org/varia/nooo-hbsc +``` + ### System requirements Install the system requirements: From c15a3140e8efa3139d8afc0c18af9a280b3e4646 Mon Sep 17 00:00:00 2001 From: Luke Murphy Date: Mon, 1 Jul 2019 12:41:36 +0200 Subject: [PATCH 4/6] Just include questions as hints --- content/fundamentals/ssh.md | 28 ++++------------------------ 1 file changed, 4 insertions(+), 24 deletions(-) diff --git a/content/fundamentals/ssh.md b/content/fundamentals/ssh.md index c21c200..ef25b65 100644 --- a/content/fundamentals/ssh.md +++ b/content/fundamentals/ssh.md @@ -326,40 +326,20 @@ tips can help you in this process. Here are some questions to ask yourself: * Is your public key registered on the server in the `$HOME/.ssh/authorized_keys` folder? - - * Are the `$HOME/.ssh` permissions correct? (see this [SO thread](https://superuser.com/questions/215504/permissions-on-private-key-in-ssh-folder)) - - * Is the SSH server running? (`sudo systemctl status sshd`) - + * Are the `$HOME/.ssh` permissions correct? (see [here](https://superuser.com/questions/215504/permissions-on-private-key-in-ssh-folder)) + * Is the SSH server running? * Is the `/etc/ssh/ssd_config` correct? - * Use the [sshd_config](https://man.openbsd.org/sshd_config) as a - reference. Don't forget to run `sudo sshd -t` to validate your - changes. After validating, always restart the SSH server after - making configuration changes - * What does `sudo tail -f /var/log/auth.log` say? - * Every time an SSH client attempts to connect, a log - entry will be put into this file. Some hint as to why - it is failing should be here. ### On the client Here are some questions to ask yourself: * What does `ssh -vvvvv myhomebrewserver` tell you? - - * Are the `$HOME/.ssh` folder permissions correct? (see this [SO thread](https://superuser.com/questions/215504/permissions-on-private-key-in-ssh-folder)) - - * Is the SSH server available at the port you expect? (`sudo nmap -p 22 myhomebrewserver`) - + * Are the `$HOME/.ssh` folder permissions correct? (see [here](https://superuser.com/questions/215504/permissions-on-private-key-in-ssh-folder)) + * Is the SSH server available at the port you expect? * Is your `$HOME/.ssh/config` correct? - * What is registered with the local `ssh-agent`? - * Check which keys are registered with `ssh-add -L`. If you - see unrecognised keys, you can kill and restart the agent: - * `sudo pkill ssh-agent` - * ` eval "$(ssh-agent -s)"` - * `ssh-add ~/.ssh/id_ed25519` ## Conclusions From e352971d017ece8b73ec8e8f0245978792284cbf Mon Sep 17 00:00:00 2001 From: Luke Murphy Date: Mon, 1 Jul 2019 12:43:04 +0200 Subject: [PATCH 5/6] Mark this as a TODO --- README.md | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/README.md b/README.md index 10de788..ded340d 100644 --- a/README.md +++ b/README.md @@ -69,8 +69,4 @@ us to work on new articles and still store the pages here in the repository. ## Deploying the site -Just run the usual: - -``` -$ git push origin master -``` +TODO. From 47b45a6b8557c2ad5054287a8e86d670f2cf3e3f Mon Sep 17 00:00:00 2001 From: lidia pereira Date: Wed, 24 Jul 2019 15:12:07 +0200 Subject: [PATCH 6/6] minor edit on manifesto text --- content/pages/manifesto.md | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/content/pages/manifesto.md b/content/pages/manifesto.md index faad1ab..54cccc8 100644 --- a/content/pages/manifesto.md +++ b/content/pages/manifesto.md @@ -1,21 +1,22 @@ Title: manifesto -Date: 2019-06-18 +Date: 2019-06-18 save_as: index.html status: hidden -- The homebrewserver.club takes the 'home' in homebrewserver.club literally and the 'self' in self-hosting figuratively. +THE HOMEBREWSERVER.CLUB: -- Approaches not Apps +* Takes the 'home' in homebrewserver.club literally and the 'self' in self-hosting figuratively -- Yes, We're Config™ +* Promotes approaches, not apps -- A space for learning together +* Yes, We're Config™ -- Serves from constraints +* Is a space for learning together -- A bunch of amateurs +* Serves from constraints -- Embracing the feminist server manifesto +* Is a bunch of amateurs -- Aspires to broaden participation +* Embraces the feminist server manifesto +* Aspires to broaden participation