tor 2 feb 2023 11:21:01 CET

9 files changed, 134 insertions, 145 deletions

diff --git a/.vimwiki_tags b/.vimwiki_tags
index edacf59..972d53c 100644
--- a/.vimwiki_tags
+++ b/.vimwiki_tags
@@ -5,10 +5,10 @@
 !_TAG_PROGRAM_NAME	Vimwiki Tags
 !_TAG_PROGRAM_URL	https://github.com/vimwiki/vimwiki
 !_TAG_PROGRAM_VERSION	2.5
-TODO	GitServer.wiki	53;"	vimwiki:GitServer\tGitServer#Git Server#Autentisering#Autentisering SSH#Problem
-TODO	GitServer.wiki	96;"	vimwiki:GitServer\tGitServer#Taggning#Cleanup
-dressman	Kläder.wiki	25;"	vimwiki:Kläder\tKläder#Kläder, klädstorlekar, m.m.#Dressmann "Slim Fit" measurements
-tidle	Media.wiki	33;"	vimwiki:Media\tMedia#tidle
+TODO	GitServer.wiki	9;"	vimwiki:GitServer\tGitServer#Publicering av "statiska" filer
+TODO	GitServer.wiki	17;"	vimwiki:GitServer\tGitServer#Backup
+TODO	GitServer.wiki	40;"	vimwiki:GitServer\tGitServer#Autentisering#Autentisering SSH#Problem
+TODO	Västgöta/webbsida.wiki	389;"	vimwiki:Västgöta/webbsida\tVästgöta/webbsida#Veckbrev mailproxy
+TODO	Wordpress Calendar Plugins.wiki	3;"	vimwiki:Wordpress Calendar Plugins\tWordpress Calendar Plugins#Kalender
+tilde	Media.wiki	33;"	vimwiki:Media\tMedia#tilde
 tilde	Media.wiki	34;"	vimwiki:Media\tMedia#tilde
-todo	Västgöta/webbsida.wiki	389;"	vimwiki:Västgöta/webbsida\tVästgöta/webbsida#Veckbrev mailproxy
-todo	Wordpress Calendar Plugins.wiki	3;"	vimwiki:Wordpress Calendar Plugins\tWordpress Calendar Plugins#Kalender
diff --git a/GitServer.wiki b/GitServer.wiki
index 165fd9d..13d8551 100644
--- a/GitServer.wiki
+++ b/GitServer.wiki
@@ -1,39 +1,26 @@
-= Contents =
-  - [[#Git Server|Git Server]]
-      - [[#Git Server#Autentisering|Autentisering]]
-          - [[#Git Server#Autentisering#Autentisering HTTP|Autentisering HTTP]]
-              - [[#Git Server#Autentisering#Autentisering HTTP#Framtiden|Framtiden]]
-          - [[#Git Server#Autentisering#Autentisering SSH|Autentisering SSH]]
-              - [[#Git Server#Autentisering#Autentisering SSH#Problem|Problem]]
-              - [[#Git Server#Autentisering#Autentisering SSH#HTTP access|HTTP access]]
-              - [[#Git Server#Autentisering#Autentisering SSH#gitweb.owner|gitweb.owner]]
-      - [[#Git Server#Pull Requests|Pull Requests]]
-  - [[#Taggning|Taggning]]
-      - [[#Taggning#Cleanup|Cleanup]]
-  - [[#Hooks|Hooks]]
-      - [[#Hooks#Sample run of post-receive|Sample run of post-receive]]
-          - [[#Hooks#Sample run of post-receive#COMMAND LINE|COMMAND LINE]]
-          - [[#Hooks#Sample run of post-receive#ENVIRONMENT|ENVIRONMENT]]
-          - [[#Hooks#Sample run of post-receive#STDIN|STDIN]]
-          - [[#Hooks#Sample run of post-receive#Framtida förbättringar|Framtida förbättringar]]
-          - [[#Hooks#Sample run of post-receive#Default config|Default config]]
-                  - [[#Hooks#Sample run of post-receive#Default config#cclite|cclite]]
-                  - [[#Hooks#Sample run of post-receive#Default config#VVVVVV|VVVVVV]]
-                  - [[#Hooks#Sample run of post-receive#Default config#password-store|password-store]]
-                  - [[#Hooks#Sample run of post-receive#Default config#reddit-parenthesis-bot|reddit-parenthesis-bot]]
-                  - [[#Hooks#Sample run of post-receive#Default config#cgit|cgit]]
-                  - [[#Hooks#Sample run of post-receive#Default config#guile-cairo|guile-cairo]]
-      - [[#Hooks#Publish|Publish]]
-          - [[#Hooks#Publish#in repo, for `/.githooks/${hookname}.d}/*.publish`|in repo, for `/.githooks/${hookname}.d}/*.publish`]]
-          - [[#Hooks#Publish#config|config]]
-          - [[#Hooks#Publish#publish|publish]]
-
-= Git Server =
+%title Git Server
+
+Generell information om min git server som inte platsar i dess
+[[wn.public:gitserver-documentation|"officiella" dokumentation]].
+
 https://git.hornquist.se
 
-[[wn.private:git-hooks]]
+= Publicering av "statiska" filer =
+:TODO:
+[[https://git.hornquist.se/puppet/profiles/tree/manifests/cgit.pp|Puppetprofilen]]
+vilken konfigurerar cgit drar just nu ett antal sidor från CGit's
+http-endpoint. Det leder till att de uppdateras varje körning. But ut
+till att [[wn.private:Continious deployment|de automatiskt publiceras]]
+och dra därifrån istället (kan vara både över HTTP och lokalt).
+
+= Backup =
+:TODO:
+
+En bakuplösning måste finnas
+
+[[wn.private:gitlab-mirroring]] ::
 
-== Autentisering ==
+= Autentisering =
 
 === Autentisering HTTP ===
 ==== Framtiden ====
@@ -71,7 +58,7 @@ Då (planen är att) cgit ska autentisera användare mot fälten
 Alternativt att någon form av gemensamm config sätts, som trycker till
 dem båda.
 
-== Pull Requests ==
+= Pull Requests =
 
 Taget från [[Vimwiki]]:
 
@@ -87,69 +74,46 @@ En lösning är att ha fyra access-nivåer till servern (eller
 - Kan jobba på existerande grenar (som de inte skapat)
 - Full access
 
-= Taggning =
-{{{
-find -type d -name \*.git -execdir env GIT_DIR={} git config gitweb.category Liu \;
-}}}
+= Hooks =
+- [[gitserver-documentation]]
 
-== Cleanup ==
-:TODO:
-- [ ] `gitweb.category` should be set automaticly
+= Framtida förbättringar =
+- `enable-remote-branches` ([[man:cgitrc#5]])
+- Vad händer om ett repo har både subdir och kattegori
+    - Vad händer om de inte stämmer överrens?
+- Delade repositories
+    - gitolite?
 
-= Hooks =
+== Publish ==
 
-- [[gitserver-documentation]]
+githooks.hornquist.se?
 
-== Sample run of post-receive ==
+https://git.hornquist.se/githooks/
+⇒ https://githooks.hornquist.se/githooks/
 
-Repo stored in `~git/git/test.git`, pushed over SSH.
+/githooks/commit/?id=<hash>
+/calp/tag/?h=v0.5.9
 
-=== COMMAND LINE ===
-{{{
-argv ['/dev/fd/4']
- cwd '/home/git/git/test.git'
-}}}
+=== in repo, for `/.githooks/${hookname}.d}/*.publish` ===
+Setup containerized environment?
 
-=== ENVIRONMENT ===
-{{{
-DBUS_SESSION_BUS_ADDRESS 'unix:path=/run/user/1001/bus'
-                 GIT_DIR '.'
-           GIT_EXEC_PATH '/usr/lib/git-core'
-   GIT_PUSH_OPTION_COUNT '0'
-                    HOME '/home/git'
-                    LANG 'en_US.UTF-8'
-                LANGUAGE 'en_US:en'
-                 LOGNAME 'git'
-              MOTD_SHOWN 'pam'
-                    PATH '/usr/lib/git-core:/home/git/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin'
-                     PWD '/home/git'
-                   SHELL '/bin/bash'
-                   SHLVL '0'
-              SSH_CLIENT '46.59.41.54 60166 22'
-          SSH_CONNECTION '46.59.41.54 60166 90.143.207.193 22'
-                    USER 'git'
-         XDG_RUNTIME_DIR '/run/user/1001'
-       XDG_SESSION_CLASS 'user'
-          XDG_SESSION_ID '59490'
-        XDG_SESSION_TYPE 'tty'
-                       _ '/usr/bin/git-receive-pack'
-                GITHOOKS '1'
-}}}
 
-=== STDIN ===
-{{{
-7aaa112c7563e535f71f99e79fc3bf008f45750d 432ef726ac54c0acecc9c9728129413510e518b4 refs/heads/master
-}}}
+=== config ===
+if `githooks.checkout = true`
+end
 
+env
+GIT_SOURCE_URL=https://git.hornquist.se/githooks/tree/${filename}
+GIT_REPO_DIR=${repo_dir}
+TARGET_DIRECTORY=${target_directory}
+PUBLISH=${target_directory}/file-to-publish
 
-=== Framtida förbättringar ===
-- `enable-remote-branches` ([[man:cgitrc#5]])
-- Vad händer om ett repo har både subdir och kattegori
-    - Vad händer om de inte stämmer överrens?
-- Delade repositories
-    - gitolite?
+=== publish ===
+{{{
+find -t file ?
+}}}
 
-=== Default config ===
+= Default config =
 {{{
 [core]
     repositoryformatversion = 0
@@ -158,27 +122,27 @@ DBUS_SESSION_BUS_ADDRESS 'unix:path=/run/user/1001/bus'
 }}}
 41adefcd1f91e91d473275a100d31a2c
 
-===== cclite =====
+== cclite ==
 [remote "origin"]
     url = https://github.com/Sorroko/cclite
 
-===== VVVVVV =====
+== VVVVVV ==
 [remote "origin"]
     url = https://github.com/TerryCavanagh/VVVVVV
     fetch = `+refs/heads/*:refs/remotes/origin/*`
 
-===== password-store =====
+== password-store ==
 [remote "upstream"]
     url = https://git.zx2c4.com/password-store
     fetch = `+refs/heads/*:refs/remotes/upstream`
 
-===== reddit-parenthesis-bot =====
+== reddit-parenthesis-bot ==
 [gitweb]
 	category = fork
 [remote "origin"]
 	url = https://github.com/HugoNikanor/reddit-parenthesis-bot
 
-===== cgit =====
+== cgit ==
 [gitweb]
     group = cgit
     category = fork
@@ -186,38 +150,9 @@ DBUS_SESSION_BUS_ADDRESS 'unix:path=/run/user/1001/bus'
     url = git://git.zx2c4.com/cgit
     fetch = `+refs/heads/*:refs/remotes/upstream/*`
 
-===== guile-cairo =====
+== guile-cairo ==
 [gitweb]
     category = fork
 [remote "upstream"]
     url = git://git.savannah.nongnu.org/guile-cairo.git
     fetch = `+refs/heads/*:refs/remotes/upstream/*`
-    
-== Publish ==
-
-githooks.hornquist.se?
-
-https://git.hornquist.se/githooks/
-⇒ https://githooks.hornquist.se/githooks/
-
-/githooks/commit/?id=<hash>
-/calp/tag/?h=v0.5.9
-
-=== in repo, for `/.githooks/${hookname}.d}/*.publish` ===
-Setup containerized environment?
-
-
-=== config ===
-if `githooks.checkout = true`
-end
-
-
-env
-GIT_SOURCE_URL=https://git.hornquist.se/githooks/tree/${filename}
-GIT_REPO_DIR=${repo_dir}
-TARGET_DIRECTORY=${target_directory}
-PUBLISH=${target_directory}/file-to-publish
-
-=== publish ===
-{{{
-find -t file ?
diff --git a/Kläder.wiki b/Kläder.wiki
index 9858435..ac85ccf 100644
--- a/Kläder.wiki
+++ b/Kläder.wiki
@@ -22,7 +22,6 @@ Byxor :: 32/30
 - MX 34R
 
 == Dressmann "Slim Fit" measurements ==
-:dressman:
 
 | size | collar | Chest | Waist width | Back length | Sleeve length |
 |------|--------|-------|-------------|-------------|---------------|
diff --git a/Media.wiki b/Media.wiki
index 11a6ea4..4190085 100644
--- a/Media.wiki
+++ b/Media.wiki
@@ -30,7 +30,7 @@ Teolog
 == Böcker (fackliga) ==
 - [ ] "List Processing in Real Time on a Serial Computer" by Henry Baker
 - [ ] Haskell from first principles
-- [ ] Just for Fun by Linus Torvalds :tidle:
+- [ ] Just for Fun by Linus Torvalds :tilde:
 - [o] Software Design for Flexibility :tilde:
     - [X] Started
     - [ ] Finished
diff --git a/Västgöta/webbsida.wiki b/Västgöta/webbsida.wiki
index 9fc323e..3625b71 100644
--- a/Västgöta/webbsida.wiki
+++ b/Västgöta/webbsida.wiki
@@ -386,7 +386,7 @@ wp post create \
 https://git.lysator.liu.se/hugo/wp-publish-by-email
 
 = Veckbrev mailproxy =
-:todo:
+:TODO:
 
 Veckbrev bör automatiskt publiceras på webbsidan då de skickas till
 listan... Uppnås troligen enklast genom att lägga till
diff --git a/Wordpress Calendar Plugins.wiki b/Wordpress Calendar Plugins.wiki
index 66a238b..42c2810 100644
--- a/Wordpress Calendar Plugins.wiki
+++ b/Wordpress Calendar Plugins.wiki
@@ -1,6 +1,6 @@
 
 = Kalender =
-:todo:
+:TODO:
 
 Nuvarande har problem
 
diff --git a/git.wiki b/git.wiki
index d017103..5385d57 100644
--- a/git.wiki
+++ b/git.wiki
@@ -1,3 +1,49 @@
 
-- `git describe --tags <commit>` Which tag is this commit after?
-- `git describe --contains <commit>` Which tag "contains" this commit
+`git describe --tags <commit>` :: Which tag is this commit after?
+`git describe --contains <commit>` :: Which tag "contains" this commit
+`git describe --tags --match 'v[0-9].[0-9]*'`
+:: If HEAD is on matching tag, show tag name, otherwise show
+:: _<tag name>_-_<commits since>_-_<short hash>_
+
+== Git hook "syntax" highlighting ==
+The output of git hooks are in some cases highlighted, see the
+following examples (each directly echoed to stdout from a post-receive
+hook) (the text after the term/colon doesn't matter)
+
+Color codes taken from my
+[[https://github.com/HugoNikanor/dotfiles/blob/a82c4ef3a99d66009d888a8fb64c110b8b8990c6/config/alacritty/alacritty.yml|Alacritty Config]]
+
+=== Yellow ===
+- remote: {{#|hint|style="color:#de935f;"}}: small
+- remote: {{#|Hint|style="color:#de935f;"}}: large
+- remote: {{#|Hint|style="color:#de935f;"}} no color
+- remote: {{#|hint|style="color:#de935f;"}} small
+=== Bold Yellow ===
+- remote: {{#|warning|style="color:#f0c674;font-weight:bold;"}}: small
+- remote: {{#|Warning|style="color:#f0c674;font-weight:bold;"}}: large
+- remote: {{#|Warning|style="color:#f0c674;font-weight:bold;"}} no color
+- remote: {{#|warning|style="color:#f0c674;font-weight:bold;"}} no color
+=== Bold Green ===
+- remote: {{#|success|style="color:#b5bd68;font-weight:bold"}}: small
+- remote: {{#|Success|style="color:#b5bd68;font-weight:bold"}}: large
+- remote: {{#|Success|style="color:#b5bd68;font-weight:bold"}} no color
+- remote: {{#|success|style="color:#b5bd68;font-weight:bold"}} no color
+=== Bold Red ===
+- remote: {{#|error|style="color:#cc6666;font-weight:bold"}}: small
+- remote: Error: large   # This one apparently just doesn't
+- remote: {{#|Error|style="color:#cc6666;font-weight:bold"}} no color
+- remote: {{#|error|style="color:#cc6666;font-weight:bold"}} no color
+
+= Multi git tools =
+Tools for working on mutiple repostories at once
+
+== Multi-git-status ==
+`mgitstatus`, https://github.com/fboender/multi-git-status
+
+
+Recurses the tree from current point, finds all repos, and tells their
+status (needs commit, needs push, ...)
+Has the binary `mgitstatus`
+
+Gita
+https://github.com/nosarthur/gita
diff --git a/gitserver-documentation.wiki b/gitserver-documentation.wiki
index e3c45f3..24b7c4e 100644
--- a/gitserver-documentation.wiki
+++ b/gitserver-documentation.wiki
@@ -1,3 +1,9 @@
+%title About page for git.hornquist.se
+
+%% REMOVE A START
+This is the about page for https://git.hornquist.se/?p=about.
+%% REMOVE A END
+
 = Hooks =
 Each repository is initialized with a hook directory which symlinks to
 a global hooks directory. In the global hooks directory, each
@@ -55,6 +61,15 @@ push containing everything in the repo.
 [[https://git.hornquist.se/?q=scheme|scheme]] :: Misc scheme code
 [[https://git.hornquist.se/?q=unity|unity]] :: Misc Unity (game engine) code
 
+= Templates =
+
+{{{
+GIT ~ $ tree $(git config --global init.templateDir)
+/usr/share/githooks/template/
+├── description -> /dev/null
+└── hooks -> /usr/share/githooks/hooks
+}}}
+
 = Remaning Configuration =
 
 The cgit server is configuration is mostly contained in
diff --git a/index.wiki b/index.wiki
index f6c60dd..c4ec4fb 100644
--- a/index.wiki
+++ b/index.wiki
@@ -133,18 +133,12 @@
 
 = Generated Tags =
 == TODO ==
-  - [[GitServer#Git Server#Autentisering#Autentisering SSH#Problem]]
-  - [[GitServer#Taggning#Cleanup]]
-
-== dressman ==
-  - [[Kläder#Kläder, klädstorlekar, m.m.#Dressmann "Slim Fit" measurements]]
-
-== tidle ==
-  - [[Media#tidle]]
+  - [[GitServer#Autentisering#Autentisering SSH#Problem]]
+  - [[GitServer#Backup]]
+  - [[GitServer#Publicering av "statiska" filer]]
+  - [[Västgöta/webbsida#Veckbrev mailproxy]]
+  - [[Wordpress Calendar Plugins#Kalender]]
 
 == tilde ==
   - [[Media#tilde]]
-
-== todo ==
-  - [[Västgöta/webbsida#Veckbrev mailproxy]]
-  - [[Wordpress Calendar Plugins#Kalender]]
+  - [[Media#tilde]]