merge

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:
@@ -51,19 +57,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
@@ -72,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.

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
 

content/pages/manifesto.md

@@ -3,19 +3,21 @@ 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]({filename}../fundamentals/manifesto.md#the-homebrewserverclub-takes-the-home-in-homebrewserverclub-literally-and-the-self-in-self-hosting-figuratively)
+=======
+THE HOMEBREWSERVER.CLUB:
 
-[Approaches not Apps]({filename}../fundamentals/manifesto.md#approaches-not-apps)
+* Takes the 'home' in homebrewserver.club literally and the 'self' in self-hosting figuratively
 
-[Yes, We're Config™]({filename}../fundamentals/manifesto.md#yes-were-configtm)
+* Promotes approaches, not apps
 
-[Not your one click solution]({filename}../fundamentals/manifesto.md#not-your-one-click-solution)
+* Yes, We're Config™
 
-[Serving from constraints]({filename}../fundamentals/manifesto.md#serving-from-constraints)
+* Is a space for learning together
 
-[A bunch of amateurs]({filename}../fundamentals/manifesto.md#a-bunch-of-amateurs)
+* Serves from constraints
 
-[Embracing the feminist server manifesto]({filename}../fundamentals/manifesto.md#embracing-the-feminist-server-manifesto)
+* Is a bunch of amateurs
 
-[Aspiring to broaden participation]({filename}../fundamentals/manifesto.md#aspiring-to-broaden-participation)
+* Embraces the feminist server manifesto
 
+* Aspires to broaden participation

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

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'])