Merge branch 'master' of /home/hugo/git/wiki-public

8 files changed, 78 insertions, 44 deletions

diff --git a/.vimwiki_tags b/.vimwiki_tags
new file mode 100644
index 0000000..802b021
--- /dev/null
+++ b/.vimwiki_tags
@@ -0,0 +1,3 @@
+!_TAG_FILE_SORTED	1	
+shs+	Lysator.wiki	57;"	vimwiki:Lysator\tLysator#shs+
+y+y	Lysator.wiki	77;"	vimwiki:Lysator\tLysator#y+y
diff --git a/Gamejam.wiki b/Gamejam.wiki
new file mode 100644
index 0000000..5e5aba3
--- /dev/null
+++ b/Gamejam.wiki
@@ -0,0 +1,6 @@
+Inverse cube law, Godzilla istadör.
+
+Spel där man försöker lura folk att godzilla finns på rikgit. Men
+egentligen är det bara en stor balong.
+
+Pizza-cutter world
diff --git a/LitheKod.wiki b/LiTHeKod.wiki
index acd81d8..acd81d8 100644
--- a/LitheKod.wiki
+++ b/LiTHeKod.wiki
diff --git a/Lysator/WWW.wiki b/Lysator/WWW.wiki
index 656a0f0..e8c5866 100644
--- a/Lysator/WWW.wiki
+++ b/Lysator/WWW.wiki
@@ -1,21 +1,22 @@
 = Contents =
   - [[#Installationen|Installationen]]
   - [[#Anteckningar|Anteckningar]]
+    - [[#Anteckningar#Nya WWW|Nya WWW]]
     - [[#Anteckningar#/lysator/lyswww/|/lysator/lyswww/]]
       - [[#Anteckningar#/lysator/lyswww/#files|files]]
       - [[#Anteckningar#/lysator/lyswww/#main|main]]
-      - [[#Anteckningar#/lysator/lyswww/#projects|projects]]
-        - [[#Anteckningar#/lysator/lyswww/#projects#front|front]]
-        - [[#Anteckningar#/lysator/lyswww/#projects#planet|planet]]
-        - [[#Anteckningar#/lysator/lyswww/#projects#roxen|roxen]]
-      - [[#Anteckningar#/lysator/lyswww/#users|users]]
-    - [[#Anteckningar#Nya WWW|Nya WWW]]
-    - [[#Anteckningar#DNS|DNS]]
 
 = Installationen =
 
 Roxen @ `/opt/roxen`, due to roxen doing its own thing.
 
+Roxen
+:25980 - admin interface
+:8080  - HTTP
+    Serving filesystem under
+    `/srv/www/projects/roxen`
+
+
 = Anteckningar =
 
 llvm direkt på disken
@@ -30,6 +31,10 @@ lvcreate -L 1000G www
 mkfs.ext4 /dev/www/lvol0
 }}}
 
+== Nya WWW ==
+Flytta protokoll till att ligga där man förväntar sig
+Alltså, filer bör ligga nära där de visas
+
 == /lysator/lyswww/ ==
 === files ===
 Old stuff, remove? 
@@ -40,30 +45,9 @@ Contains symblink to `/mp/lyswww-main-static_pages`, which is
 
 `/srv/www/main` on nyarlathotep is the working dir of LysCMS.
 
-=== projects ===
-
-==== front ====
-
-Contains some files which might be linked to from somewhere.
-
-Probably remove this.
-
-==== planet ====
-
-Planet Lysator.
-
-==== roxen ====
-
-https://knuth.lysator.liu.se:25980
-
-Just about everything else. Might need a (later) cleanup.
-
-=== users ===
-`~<user>/.public`
-
-== Nya WWW ==
-Flytta protokoll till att ligga där man förväntar sig
-
-
-== DNS ==
-lsff.nu proxy-pass nginx
+- `projects/front`
+  Contains some files which might be linked to from somewhere.
+  Probably remove this.
+- `projects/roxen`
+- `users` -- `~<user>/.public`
+- `planet`
diff --git a/Terminal Driver.wiki b/Terminal Driver.wiki
index b99f94a..ad0a2fa 100644
--- a/Terminal Driver.wiki
+++ b/Terminal Driver.wiki
@@ -3,6 +3,7 @@
 - [[https://atmega32-avr.com/how-to-super-simple-serial-terminal-using-atmega128/|Fungerande exempel på ATMEL]]
 - [[http://linusakesson.net/programming/tty/index.php|The TTY demystified]]
 - https://www.linux.it/~rubini/docs/serial/serial.html
+- [[https://www.kernel.org/doc/html/v4.17/driver-api/gpio/consumer.html|kernel doc html v4 17 driver api gpio consumer]]
 == Terminal Driver ==
 -
 [[https://en.wikipedia.org/wiki/Linux_console|Wikipedia:Linux console]]
@@ -39,3 +40,8 @@ Med skärmen till höger om headern.
 
 == Datablad ==
 https://www.raspberrypi.org/documentation/hardware/raspberrypi/mechanical/rpi_MECH_3bplus.pdf
+
+
+`linux/arch/arm/boot/dts/bcm2837-rpi-3-b.dts`
+
+compatible field
diff --git a/index.wiki b/index.wiki
index e9aadbd..4ab608d 100644
--- a/index.wiki
+++ b/index.wiki
@@ -33,7 +33,8 @@
     * [[Nginx]]
     * [[MediawikiFS]]
     * [[Spel]]
-    * [[LitheKod]]
+    * [[Gamejam]]
+    * [[LiTHeKod]]
 
     * [[diary/diary|Dagbok]]
 
@@ -44,15 +45,6 @@
 - [ ] [[https://stumpwm.github.io|StumpWM]]
 
 = Generated Tags =
-== TODO ==
-  - [[GitServer#Git Server#Autentisering#Autentisering SSH#Problem]]
-  - [[GitServer#Taggning#Cleanup]]
-  - [[Mimetypes#Mimetypes]]
-  - [[Scripts#Scripts#newmail#TODO]]
-
-== möte ==
-  - [[LitheKod#LitheKod#Vårmöte 2019#Bilaga B, Kontraförslag]]
-
 == shs+ ==
   - [[Lysator#shs+]]
 
diff --git a/templates/add.css b/templates/add.css
new file mode 100644
index 0000000..77c7400
--- /dev/null
+++ b/templates/add.css
@@ -0,0 +1,42 @@
+body {
+	margin: 0;
+	font-size: 100%;
+}
+
+
+h1 { color: #a54242; }
+h2 { color: #8c9440; }
+h3 { color: #5f819d; }
+
+p {
+	max-width: 60ex;
+	text-align: justify;
+}
+
+table {
+	border-collapse: collapse;
+}
+
+tr:nth-child(odd) {
+	background-color: #f0f0f0;
+}
+
+/* ---------------------------------------- */
+
+div[id='Top Heading'] + ul {
+	width: 120%;
+}
+
+div[id='Top Heading'] + ul li {
+	display: inline-block;
+	width: 10em;
+}
+
+.side {
+	display: flex;
+	justify-content: space-around;
+}
+
+.side > * {
+	margin: auto 0 auto 0;
+}
diff --git a/templates/default.tpl b/templates/default.tpl
index 59ceeb4..0910c5b 100644
--- a/templates/default.tpl
+++ b/templates/default.tpl
@@ -2,6 +2,7 @@
 <html>
 	<head>
         <link rel="Stylesheet" type="text/css" href="%root_path%style.css" />
+        <link rel="Stylesheet" type="text/css" href="%root_path%add.css" />
         <title>%title%</title>
         <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 		<meta name="viewport" content="width=device-width, initial-scale=1.0">