fix line breaks and some left-over html tags
This commit is contained in:
@@ -7,10 +7,6 @@ theme = [ "hugo-sustain", "hugo-cloak-email", "hugo-mastodon-comments", "hugo-sn
|
|||||||
codeFences = true
|
codeFences = true
|
||||||
style = "emacs"
|
style = "emacs"
|
||||||
|
|
||||||
[blackfriday]
|
|
||||||
# preserves linebreaks, and transforms to <br />
|
|
||||||
extensions = [ "" ]
|
|
||||||
|
|
||||||
[permalinks]
|
[permalinks]
|
||||||
blog = "/blog/:year/:slug"
|
blog = "/blog/:year/:slug"
|
||||||
|
|
||||||
|
|||||||
@@ -90,7 +90,7 @@ Now that you know how (and that) the system works, we will make it easier. Of co
|
|||||||
Host server1
|
Host server1
|
||||||
HostName server1.net
|
HostName server1.net
|
||||||
Port 22
|
Port 22
|
||||||
User client</pre>
|
User client
|
||||||
```
|
```
|
||||||
|
|
||||||
Save it and try to use this shortcut. It also works for normal SSH connection like ‚_ssh server1_‚. For the _Host_ variable, you could use any name you can remember easily, for instance _privateserver_.
|
Save it and try to use this shortcut. It also works for normal SSH connection like ‚_ssh server1_‚. For the _Host_ variable, you could use any name you can remember easily, for instance _privateserver_.
|
||||||
|
|||||||
@@ -24,14 +24,14 @@ Host src.mehl.mx
|
|||||||
HostName src.mehl.mx
|
HostName src.mehl.mx
|
||||||
User your-username
|
User your-username
|
||||||
IdentityFile ~/.ssh/id_rsa_gogs
|
IdentityFile ~/.ssh/id_rsa_gogs
|
||||||
IdentitiesOnly yes</pre>
|
IdentitiesOnly yes
|
||||||
```
|
```
|
||||||
|
|
||||||
This forces your client to use the Gogs-specific SSH key for every connection to [src.mehl.mx](https://src.mehl.mx) – and not the default one for this IP/server. However, this is only a problem for you as the administrator, not for other users. It took some time for me to find that out :)
|
This forces your client to use the Gogs-specific SSH key for every connection to [src.mehl.mx](https://src.mehl.mx) – and not the default one for this IP/server. However, this is only a problem for you as the administrator, not for other users. It took some time for me to find that out :)
|
||||||
|
|
||||||
**Update**: It’s best to use the built-in server if you cannot create a separate user for Gogs and if you depend on using the default `~/.ssh/authorized_keys` file for other use cases than gogs (e.g. to log in). The problems lies in Gogs behaviour: sometimes it rewrites the `authorized_keys` file without being asked to do so, and as a result you cannot log into the user’s account anymore via SSH! To make the solution easy for you, here’s the excerpt of my `custom/conf/app.ini` file:
|
**Update**: It’s best to use the built-in server if you cannot create a separate user for Gogs and if you depend on using the default `~/.ssh/authorized_keys` file for other use cases than gogs (e.g. to log in). The problems lies in Gogs behaviour: sometimes it rewrites the `authorized_keys` file without being asked to do so, and as a result you cannot log into the user’s account anymore via SSH! To make the solution easy for you, here’s the excerpt of my `custom/conf/app.ini` file:
|
||||||
|
|
||||||
```ini
|
```text
|
||||||
[server]
|
[server]
|
||||||
START_SSH_SERVER = true
|
START_SSH_SERVER = true
|
||||||
SSH_PORT = ${DEDICATED_SSH_PORT_FOR_GOGS}
|
SSH_PORT = ${DEDICATED_SSH_PORT_FOR_GOGS}
|
||||||
|
|||||||
@@ -43,7 +43,9 @@ git clone https://src.mehl.mx/mxmehl/fsfe-local-build.git ~/subversion/fsfe/loca
|
|||||||
|
|
||||||
Now we take care of `trunk`. In case you already have a copy of `trunk` on your computer, you can use this location, but please do a `svn up` beforehand and be sure that the output of `svn status` is empty (so no new or modified files on your side). If you don’t have `trunk` yet, download the repository to the proposed location:
|
Now we take care of `trunk`. In case you already have a copy of `trunk` on your computer, you can use this location, but please do a `svn up` beforehand and be sure that the output of `svn status` is empty (so no new or modified files on your side). If you don’t have `trunk` yet, download the repository to the proposed location:
|
||||||
|
|
||||||
<pre class="lang:default highlight:0 decode:true">svn --username $YourFSFEUsername co https://svn.fsfe.org/fsfe-web/trunk ~/subversion/fsfe/fsfe-web/trunk</pre>
|
```bash
|
||||||
|
svn --username $YourFSFEUsername co https://svn.fsfe.org/fsfe-web/trunk ~/subversion/fsfe/fsfe-web/trunk
|
||||||
|
```
|
||||||
|
|
||||||
### 2. Build full website
|
### 2. Build full website
|
||||||
|
|
||||||
@@ -106,7 +108,7 @@ Now you can test whether the webserver is correctly configured. To start a tempo
|
|||||||
lighttpd -Df ~/subversion/fsfe/local-build/lighttpd-fsfe.conf
|
lighttpd -Df ~/subversion/fsfe/local-build/lighttpd-fsfe.conf
|
||||||
```
|
```
|
||||||
|
|
||||||
Until you press Ctrl+C, you should be able to open your local FSFE website in any browser using the URL http://localhost:5080. For example, open the URL <http://localhost:5080/contribute/contribute.en.html> in your browser. You should see basically the same website as the original [fsfe.org website][5]. If not, double-check the paths, if the lighttpd process is still running, or if the full website build is already finished.
|
Until you press Ctrl+C, you should be able to open your local FSFE website in any browser using the URL `http://localhost:5080`. For example, open the URL `http://localhost:5080/contribute/contribute.en.html` in your browser. You should see basically the same website as the original [fsfe.org website][5]. If not, double-check the paths, if the lighttpd process is still running, or if the full website build is already finished.
|
||||||
|
|
||||||
### 4. Single page build script
|
### 4. Single page build script
|
||||||
|
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ You cannot imagine how long I’ve waited to write this blog post. Normally I’
|
|||||||
|
|
||||||
{{< figure src="/img/blog/astroid-ilovefs.jpg" class="text-center medium" caption="Hugo and me declaring our love to astroid" >}}
|
{{< figure src="/img/blog/astroid-ilovefs.jpg" class="text-center medium" caption="Hugo and me declaring our love to astroid" >}}
|
||||||
|
|
||||||
_**Update February 2018**: Meanwhile I have <a href="https://src.mehl.mx/mxmehl/mail-config">published my mail config</a> incl. astroid, notmuch, offlineimap etc. It is a rather complicated and special setup but perhaps it will help you._
|
_**Update February 2018**: Meanwhile I have [published my mail config](https://src.mehl.mx/mxmehl/mail-config) incl. astroid, notmuch, offlineimap etc. It is a rather complicated and special setup but perhaps it will help you._
|
||||||
|
|
||||||
Okay, maybe I’ll add two or three words to explain why I am so grateful to the authors of this awesome Free Software application. Firstly, I should note that until ~6 months ago I have used Thunderbird – extended with lots of add-ons but still a mail user agent that most of you will know. But with each new email and project it became obvious to me that I have to find a way to organise my tenthousands of mails in a better way: not folder-based but tag-based, but not to the expense of overview and comfort.
|
Okay, maybe I’ll add two or three words to explain why I am so grateful to the authors of this awesome Free Software application. Firstly, I should note that until ~6 months ago I have used Thunderbird – extended with lots of add-ons but still a mail user agent that most of you will know. But with each new email and project it became obvious to me that I have to find a way to organise my tenthousands of mails in a better way: not folder-based but tag-based, but not to the expense of overview and comfort.
|
||||||
|
|
||||||
|
|||||||
@@ -3,15 +3,15 @@ title: Contact
|
|||||||
page: true
|
page: true
|
||||||
---
|
---
|
||||||
|
|
||||||
Email FSFE: {{< cloakemail address="max.mehl@fsfe.org" >}}<br />
|
Email FSFE: {{< cloakemail address="max.mehl@fsfe.org" >}}\
|
||||||
Email private: {{< cloakemail address="mail@mehl.mx" >}}<br />
|
Email private: {{< cloakemail address="mail@mehl.mx" >}}\
|
||||||
XMPP: {{< cloakemail address="max.mehl@jabber.fsfe.org" protocol="xmpp" >}}<br />
|
XMPP: {{< cloakemail address="max.mehl@jabber.fsfe.org" protocol="xmpp" >}}
|
||||||
|
|
||||||
Mastodon: [@mxmehl@mastodon.social](https://mastodon.social/@mxmehl)<br />
|
Mastodon: [@mxmehl@mastodon.social](https://mastodon.social/@mxmehl)\
|
||||||
Twitter: [@mxmehl](https://twitter.com/mxmehl)<br />
|
Twitter: [@mxmehl](https://twitter.com/mxmehl)\
|
||||||
Weblog: [mehl.mx/blog](/blog)<br />
|
Weblog: [mehl.mx/blog](/blog)\
|
||||||
Diaspora: [mxmehl@diasp.eu](https://diasp.eu/u/mxmehl)<br />
|
Diaspora: [mxmehl@diasp.eu](https://diasp.eu/u/mxmehl)\
|
||||||
LinkedIn: [mxmehl ](https://linkedin.com/in/mxmehl)<br />
|
LinkedIn: [mxmehl](https://linkedin.com/in/mxmehl)
|
||||||
|
|
||||||
GnuPG: [0x371E2E92](https://up.mehl.mx/mehl-current.pub.asc)<br />
|
GnuPG: [0x371E2E92](https://up.mehl.mx/mehl-current.pub.asc)\
|
||||||
OMEMO: [OMEMO Fingerprints](https://up.mehl.mx/mehl-omemo.asc)
|
OMEMO: [OMEMO Fingerprints](https://up.mehl.mx/mehl-omemo.asc)
|
||||||
|
|||||||
@@ -10,13 +10,11 @@ sitemap_hide: true
|
|||||||
|
|
||||||
Angaben gemäß § 5 TMG:
|
Angaben gemäß § 5 TMG:
|
||||||
|
|
||||||
Max Mehl
|
Max Mehl\
|
||||||
Singener Straße 35a
|
Singener Straße 35a\
|
||||||
78256 Steißlingen
|
78256 Steißlingen\
|
||||||
E-Mail: {{< cloakemail address="mail@mehl.mx" >}}
|
E-Mail: {{< cloakemail address="mail@mehl.mx" >}}\
|
||||||
Telefon: +49 7738 2031061
|
Telefon: +49 7738 2031061
|
||||||
Ust-ID: DE280794669
|
|
||||||
|
|
||||||
|
|
||||||
## Haftungsausschluss:
|
## Haftungsausschluss:
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user