diff options
| -rw-r--r-- | template/all.ht | 4 | ||||
| -rw-r--r-- | template/atom.ht | 16 | ||||
| -rw-r--r-- | template/front.ht | 8 | ||||
| -rw-r--r-- | template/json.ht | 10 | ||||
| -rw-r--r-- | template/monthly.ht | 4 | ||||
| -rw-r--r-- | template/single.ht | 4 | ||||
| -rw-r--r-- | trivium.el | 6 |
7 files changed, 27 insertions, 25 deletions
diff --git a/template/all.ht b/template/all.ht index 89813b9..484c27c 100644 --- a/template/all.ht +++ b/template/all.ht @@ -13,7 +13,7 @@ <h1><span class="title"> <a href="./">Trivium: grammar, logic, rhetoric</a></span> <span class="author">by -<a href="http://chneukirchen.org/">Leah Neukirchen</a></span></h1> +<a href="https://leahneukirchen.org/">Leah Neukirchen</a></span></h1> $ self[:entries].each { |entry| @@ -29,7 +29,7 @@ $# class="entry-title"> $ } <address class="author vcard"> -Copyright © 2008–2017 <a class="email fn" href="mailto:chneukirchen@gmail.com">Leah Neukirchen</a> +Copyright © 2008–2021 <a class="email fn" href="mailto:leah@vuxu.org">Leah Neukirchen</a> </address> </div> diff --git a/template/atom.ht b/template/atom.ht index 637d08d..c4cdb89 100644 --- a/template/atom.ht +++ b/template/atom.ht @@ -2,18 +2,18 @@ <feed xmlns="http://www.w3.org/2005/Atom"> <title type="text">Trivium</title> <link rel="alternate" type="text/html" - href="http://chneukirchen.org/trivium/" /> - <link rel="self" href="http://chneukirchen.org/trivium/index.atom" /> + href="https://leahneukirchen.org/trivium/" /> + <link rel="self" href="https://leahneukirchen.org/trivium/index.atom" /> <author> <name>Leah Neukirchen</name> - <uri>http://chneukirchen.org/</uri> - <email>chneukirchen@gmail.com</email> + <uri>https://leahneukirchen.org/</uri> + <email>leah@vuxu.org</email> </author> <id>tag:chneukirchen.org,2008:trivium-feed</id> <generator version="2.0">trivium.rb</generator> <rights type="xhtml"> <div xmlns="http://www.w3.org/1999/xhtml"> - Copyright © 2008-2017 Leah Neukirchen, chneukirchen@gmail.com + Copyright © 2008-2021 Leah Neukirchen, leah@vuxu.org Verbatim copying is permitted as long as this message is preserved. </div> </rights> @@ -23,11 +23,11 @@ $ self[:entries].each { |entry| <title>${entry[:title]}</title> <author> <name>Leah Neukirchen</name> - <uri>http://chneukirchen.org/</uri> - <email>chneukirchen@gmail.com</email> + <uri>https://leahneukirchen.org/</uri> + <email>leah@vuxu.org</email> </author> <link rel="alternate" type="text/html" - href="http://chneukirchen.org/trivium/${entry[:id]}" /> + href="https://leahneukirchen.org/trivium/${entry[:id]}" /> <id>tag:chneukirchen.org,2008:trivium-${entry[:id]}</id> <updated>${entry[:updated].iso8601}</updated> <published>${entry[:date].iso8601}</published> diff --git a/template/front.ht b/template/front.ht index 77d8eee..2399c57 100644 --- a/template/front.ht +++ b/template/front.ht @@ -5,9 +5,9 @@ <title>Trivium</title> <link rel="icon" href="trivium.ico"> <link rel="stylesheet" href="style.css"> - <link rel="alternate" type="application/atom+xml" title="Atom" href="http://chneukirchen.org/trivium/index.atom"> - <link rel="alternate" type="application/json" title="JSON Feed" href="http://chneukirchen.org/trivium/index.json" /> - <link rel="up" href="http://chneukirchen.org/"> + <link rel="alternate" type="application/atom+xml" title="Atom" href="https://leahneukirchen.org/trivium/index.atom"> + <link rel="alternate" type="application/json" title="JSON Feed" href="https://leahneukirchen.org/trivium/index.json"> + <link rel="up" href="https://leahneukirchen.org/"> </head> <body> @@ -43,7 +43,7 @@ $ } <address class="author vcard" title="If you copy the content of this site to poison search engines, fuck off."> -Copyright © 2008–2017 <a class="email fn" href="mailto:chneukirchen@gmail.com">Leah Neukirchen</a><br> +Copyright © 2008–2021 <a class="email fn" href="mailto:leah@vuxu.org">Leah Neukirchen</a><br> </address> </div> diff --git a/template/json.ht b/template/json.ht index 9ad93ca..647fa37 100644 --- a/template/json.ht +++ b/template/json.ht @@ -2,17 +2,17 @@ $ require 'json' $ f = { $ "version" => "https://jsonfeed.org/version/1", $ "title" => "Trivium", -$ "home_page_url" => "http://chneukirchen.org/trivium/", -$ "feed_url" => "http://chneukirchen.org/trivium/index.json", -$ "favicon" => "http://chneukirchen.org/trivium/trivium.ico", +$ "home_page_url" => "https://leahneukirchen.org/trivium/", +$ "feed_url" => "https://leahneukirchen.org/trivium/index.json", +$ "favicon" => "https://leahneukirchen.org/trivium/trivium.ico", $ "author" => { $ "name" => "Leah Neukirchen", -$ "url" => "http://chneukirchen.org/", +$ "url" => "https://leahneukirchen.org/", $ }, $ "items" => self[:entries].map { |entry| $ { $ "id" => "tag:chneukirchen.org,2008:trivium-#{entry[:id]}", -$ "url" => "http://chneukirchen.org/trivium/#{entry[:id]}", +$ "url" => "https://leahneukirchen.org/trivium/#{entry[:id]}", $ "title" => entry[:title], $ "date_published" => entry[:date].iso8601, $ "date_modified" => entry[:updated].iso8601, diff --git a/template/monthly.ht b/template/monthly.ht index 8ef98c5..773d498 100644 --- a/template/monthly.ht +++ b/template/monthly.ht @@ -12,7 +12,7 @@ $ if self[:entries].first[:next_by_month] $ end <link rel="up" href="./"> <link rel="stylesheet" href="style.css"> - <link rel="alternate" type="application/atom+xml" title="Atom" href="http://chneukirchen.org/trivium/index.atom"> + <link rel="alternate" type="application/atom+xml" title="Atom" href="https://leahneukirchen.org/trivium/index.atom"> </head> <body> @@ -56,7 +56,7 @@ $ end </small> <address class="author vcard"> -Copyright © 2008–2017 <a class="email fn" href="mailto:chneukirchen@gmail.com">Leah Neukirchen</a> +Copyright © 2008–2021 <a class="email fn" href="mailto:leah@vuxu.org">Leah Neukirchen</a> </address> </div> diff --git a/template/single.ht b/template/single.ht index bcb13cd..360130d 100644 --- a/template/single.ht +++ b/template/single.ht @@ -12,7 +12,7 @@ $ if self[:next_by_date] $ end <link rel="up" href="${self[:date].strftime("%Y-%m")}"> <link rel="stylesheet" href="style.css"> - <link rel="alternate" type="application/atom+xml" title="Atom" href="http://chneukirchen.org/trivium/index.atom"> + <link rel="alternate" type="application/atom+xml" title="Atom" href="https://leahneukirchen.org/trivium/index.atom"> </head> <body> @@ -44,7 +44,7 @@ $:{format self} </div> <address class="author vcard"> -Copyright © 2008–2017 <a class="email fn" href="mailto:chneukirchen@gmail.com">Leah Neukirchen</a> +Copyright © 2008–2021 <a class="email fn" href="mailto:leah@vuxu.org">Leah Neukirchen</a> </address> </div> diff --git a/trivium.el b/trivium.el index 0cfe761..f067c6b 100644 --- a/trivium.el +++ b/trivium.el @@ -24,12 +24,14 @@ (defun trivium-update-blog () "Update the blog." (interactive) - (compile "cd .. ; ruby trivium.rb")) + (let ((process-connection-type nil)) + (compile "cd .. ; ruby trivium.rb"))) (defun trivium-upload-blog () "Upload the blog." (interactive) - (compile "cd .. ; ruby trivium.rb && ./upload")) + (let ((process-connection-type nil)) + (compile "cd .. ; ruby trivium.rb && ./upload"))) (defun trivium-insert-link-markup () "Insert a '.link'." |