Browse Source

tweak README.md, get rid of extraneous code.p1k3.com Makefile

Brennen Bearnes 5 months ago
parent
commit
15ae235d1e
4 changed files with 19 additions and 35 deletions
  1. 0
    1
      Makefile
  2. 18
    11
      README.md
  3. 0
    22
      code.p1k3.com/Makefile
  4. 1
    1
      code.p1k3.com/html/list.pl

+ 0
- 1
Makefile View File

@@ -69,7 +69,6 @@ profile:
69 69
 
70 70
 # Copy to a bare repo on the target system, then pull from there to a checked
71 71
 # out copy in the web root.  Requires some configuration of both repositories.
72
-# This used to pass through GitHub.  I don't really trust GitHub any more.
73 72
 publish:
74 73
 	@echo "[publishing p1k3.com and code.p1k3.com]"
75 74
 	git push origin

+ 18
- 11
README.md View File

@@ -13,14 +13,19 @@ a blog.  Up-to-date copies may be found at https://p1k3.com/.git or
13 13
         |-cart_small.jpg
14 14
         `-index
15 15
 
16
-2009 is a year, 1 is the month of January, and everything below that level is a
17
-day.  Some days are simple blobs of markup, others are directories which may
18
-contain an index file with the main text of entry, binaries like images, and
19
-one or more sub-entries.
16
+`2009` is a year, `1` is the month of January, and everything below that level
17
+is a day.  Some days are simple blobs of markup, others are directories which
18
+may contain an index file with the main text of entry, binaries like images,
19
+and one or more sub-entries.
20 20
 
21 21
 `bin/` contains various utility scripts for manipulating the contents of
22
-`/archives`.  (For example, a script to generate the linkdump from a couple of
23
-RSS feeds.)  They are generally invoked from the `Makefile`.
22
+`/archives`.  Most of these are invoked from the `Makefile`, and include:
23
+
24
+  - `linkdump.pl`: generate the linkdump from a couple of RSS feeds
25
+  - `header-photos.sh` and `photos.sh`: generate thumbnails and JSON indices
26
+    for photos
27
+  - `topics.sh` and `list-by-property.py`: generate contents of `archives/topics`
28
+  - `tagger.sh`: a utility for grepping the archive for strings and applying topic tags
24 29
 
25 30
 `templates/` contains template files.
26 31
 
@@ -34,14 +39,16 @@ repository.)
34 39
 `<include>` tag.  At this writing, it contains `shortlinks.md`, which is a set
35 40
 of links for use in Markdown.  The idea is that if a link changes or
36 41
 disappears, it can easily be edited or replaced with a local page.  All of the
37
-enclosed links begin with `sl-` for easy grepping in future.  (I have not made
38
-much use of this idea, and may not, but I have not yet ruled it out
39
-completely.)
42
+enclosed links begin with `sl-` for easy grepping in future.
40 43
 
41 44
 `topics/` contains vimwiki pages which are used to describe various topics
42 45
 covered in the entries; these are combined with an automatically rendered
43 46
 list of tagged entries to create the contents of `archives/topics/`.
44 47
 
48
+`code.p1k3.com/` contains the home page for
49
+[code.p1k3.com](https://code.p1k3.com/), which for the moment is hosted on the
50
+same system.
51
+
45 52
 See https://code.p1k3.com/gitea/brennen/wrt for the tools I use to render the
46 53
 entries here.
47 54
 
@@ -78,8 +85,8 @@ sudo pip3 install galleryhtml
78 85
 
79 86
 ### git-annex
80 87
 
81
-I'm experimenting with using [git-annex][git-annex] to store large files like
82
-photos in only some copies of the repository.
88
+I use [git-annex][git-annex] to store large files like photos in only some
89
+copies of the repository.
83 90
 
84 91
 ### lxml, dominate, and docopt python libraries
85 92
 

+ 0
- 22
code.p1k3.com/Makefile View File

@@ -1,22 +0,0 @@
1
-# This is a Makefile for configuring / publishing code.p1k3.com.
2
-#
3
-# Assumptions:
4
-#
5
-#   - Things are served by nginx from /var/www/html on code.p1k3.com
6
-#   - You have the right user accounts and SSH keys
7
-#   - code.p1k3.com has Perl
8
-#
9
-# TODO:
10
-#
11
-#   - letsencrypt refresh
12
-#   - nginx config
13
-#   - baseline installs?
14
-#   - other dependencies?  gitea?
15
-#
16
-# The publication step here is also included in the top-level Makefile's
17
-# "publish" target.
18
-
19
-all: publish
20
-
21
-publish:
22
-	ssh brennen@code.p1k3.com 'cd /var/www/p1k3/code.p1k3.com/html && ./list.pl > list.html'

+ 1
- 1
code.p1k3.com/html/list.pl View File

@@ -46,7 +46,7 @@ $list .= '  <tr>'
46 46
    . "</tr>\n";
47 47
 }
48 48
 
49
-$list .= "</tbody></table>";
49
+$list .= '</tbody></table>';
50 50
 
51 51
 say $list;
52 52
 

Loading…
Cancel
Save