Merge branch 'main' of https://github.com/fruworg/fruw.org

README.md

@@ -1 +1,14 @@
-# fruworg.github.io
+```
+           ______/\/\____/\/\______________/\/\____/\/\__________________________/\/\____/\/\______________________
+          ______/\/\____/\/\____/\/\/\____/\/\____/\/\______/\/\/\______________________/\/\__/\/\/\__/\/\________
+         ______/\/\/\/\/\/\__/\/\/\/\/\__/\/\____/\/\____/\/\__/\/\____________/\/\____/\____/\/\/\/\/\/\/\______
+        ______/\/\____/\/\__/\/\________/\/\____/\/\____/\/\__/\/\__/\/\______/\/\__________/\/\__/\__/\/\______
+       ______/\/\____/\/\____/\/\/\/\__/\/\/\__/\/\/\____/\/\/\____/\/\______/\/\/\________/\/\______/\/\______
+      ____________________________________________________________/\__________________________________________
+     ________/\/\/\__________________________________________________________________________________________
+    ______/\/\______/\/\__/\/\__/\/\__/\/\__/\/\______/\/\____/\/\/\____/\/\__/\/\____/\/\/\/\______________
+   ______/\/\/\____/\/\/\/\____/\/\__/\/\__/\/\__/\__/\/\__/\/\__/\/\__/\/\/\/\____/\/\__/\/\______________
+  ______/\/\______/\/\________/\/\__/\/\__/\/\/\/\/\/\/\__/\/\__/\/\__/\/\__________/\/\/\/\__/\/\________
+ ______/\/\______/\/\__________/\/\/\/\____/\/\__/\/\______/\/\/\____/\/\______________/\/\__/\/\________
+_________________________________________________________________________________/\/\/\/\_______________
+```

config.toml

@@ -9,16 +9,8 @@ pygmentscodefencesguesssyntax = true
 paginate = 4
 
 [params]
-	description = "всем привет!"
-	subtitlefile = true
-
-[[params.social]]
-name = "uptime"
-url = "https://up.fruw.org"
-
-[[params.social]]
-name = "git"
-url = "https://github.com/fruworg"
+description = "всем привет!"
+subtitlefile = true
 
 [[params.social]]
 name = "mail"
@@ -26,15 +18,27 @@ url = "mailto:im@fruw.org"
 
 [[params.social]]
 name = "matrix"
-url = "https://matrix.to/#/@im:fruw.org"
+url = "//matrix.to/#/@im:fruw.org"
 
 [[params.social]]
 name = "tg"
-url = "https://t.me/fruworg"
+url = "//t.me/fruworg"
 
 [[params.social]]
 name = "pgp"
-url = "https://fruw.org/0x952C15AB751A65F6"
+url = "//keybase.io/fruworg/pgp_keys.asc"
+
+[[params.social]]
+name = "keybase"
+url = "//keybase.io/fruworg/"
+
+[[params.social]]
+name = "up"
+url = "//up.fruw.org"
+
+[[params.social]]
+name = "git"
+url = "//github.com/fruworg"
 
 [[menu.main]]
 name = "посты"

content/posts/postgres-ldaps.md

@@ -35,8 +35,9 @@ ldapsearch -x -b "dc=<domain>,dc=<local>" \
 ```
 
 ## Правка pg_hba.conf
+С ldapprefix/ldapsuffix, возможно, придётся поколдовать. Стоит попробовать их оставить пустыми (="").
 ```shell
-host	<database>	<user>	<ip>/<mask>	ldap	ldapserver=<dc>.<domain>.<local>	ldapprefix="cn="	ldapsuffix=",cn=users,dc=<domain>,dc=<local>"
+host <database> <user> <ip>/<mask> ldap ldapserver=<dc>.<domain>.<local> ldapscheme=ldaps ldapprefix="cn=" ldapsuffix=",cn=users,dc=<domain>,dc=<local>"
 
 # /var/lib/pgpro/std-14/data/pg_hba.conf
 ```

content/posts/ruby-packer.md

@@ -57,7 +57,8 @@ chmod +x /usr/local/bin/rubyc
 ## Установка rubyc (stable, 2.4, не рекомендую)
 
 ```shell
-wget -P /tmp https://gw.alipayobjects.com/os/enclose-prod/1fd23e6b-d48f-4ed0-94dd-f0f539960253/rubyc-v0.4.0-linux-x64.gz
+wget -P /tmp https://gw.alipayobjects.com/os/enclose-prod\
+/1fd23e6b-d48f-4ed0-94dd-f0f539960253/rubyc-v0.4.0-linux-x64.gz
 gzip -d /tmp/rubyc-v0.4.0-linux-x64.gz
 mv /tmp/rubyc-v0.4.0-linux-x64 /usr/local/bin/rubyc
 chmod +x /usr/local/bin/rubyc 
@@ -90,4 +91,4 @@ bundle exec rake install
 ```shell
 cd <ruby-util-dir>
 rubyc -r . -d /tmp/ -o <ruby-util> exe/<ruby-util>
-```
+```

layouts/partials/subtitle.html

@@ -1,9 +1,9 @@
 <pre>   <a href="https://github.com/fruworg/fruw.org" style="border: none; color:white">___</a>    добро пожаловать на мой 
 <a href="https://github.com/fruworg/fruw.org" style="border: none; color:white"> .^o ~\</a>   open-source веб-сайт!
-<a href="https://github.com/fruworg/fruw.org" style="border: none; color:white">Y /'~) }</a>  <time style="color: var(--maincolor)" id="time">ты выключил js</time>
-<a href="https://github.com/fruworg/fruw.org" style="border: none; color:white">l/  / /</a>   <ip id="ip">и времени тут нет</ip>
-<a href="https://github.com/fruworg/fruw.org" style="border: none; color:white">   ( (</a>    <country id="country">и нет тут твоего ip</country>
-<a href="https://github.com/fruworg/fruw.org" style="border: none; color:white">    \ \</a>   <user-agent id="user-agent">и user'a agent'a нет</user-agent></pre>
+<a href="https://github.com/fruworg/fruw.org" style="border: none; color:white">Y /'~) }</a>  <time style="color: var(--maincolor)" id="time">00.00.00, 00:00:00</time>
+<a href="https://github.com/fruworg/fruw.org" style="border: none; color:white">l/  / /</a>   <ip id="ip">127.0.0.1, AS00000</ip>
+<a href="https://github.com/fruworg/fruw.org" style="border: none; color:white">   ( (</a>    <country id="country">Cobrastan, Bestburg</country>
+<a href="https://github.com/fruworg/fruw.org" style="border: none; color:white">    \ \</a>   <user-agent id="user-agent">IE 6, Bolgen OS</user-agent></pre>
 <script defer src="{{ .Site.BaseURL }}js/clock.js"></script>
 <script defer src="{{ .Site.BaseURL }}js/ip.js"></script>
 <script defer src="{{ .Site.BaseURL }}js/agent.js"></script>

static/.well-known/matrix/client

@@ -0,0 +1,5 @@
+{
+  "m.homeserver": {
+    "base_url": "https://matrix.fruw.org:8448"
+  }
+}

static/.well-known/matrix/server

@@ -0,0 +1,3 @@
+{
+    "m.server": "matrix.fruw.org:8448"
+}

static/0x952C15AB751A65F6

@@ -1,40 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-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
-JQ==
-=h847
------END PGP PUBLIC KEY BLOCK-----