From 885ea384ba51ae8c0a0eca3b4d2cc7a26b8eb011 Mon Sep 17 00:00:00 2001 From: Oleg Broytman Date: Fri, 25 May 2018 10:20:01 +0300 Subject: [PATCH] Upgrade: http://phdru.name/ -> https://phdru.name/ --- README.html | 2 +- atom_10.tmpl | 2 +- make-news.py | 4 ++-- news.py | 2 +- phd_site.tmpl | 16 ++++++++-------- reindex_blog.py | 4 ++-- rss_20.tmpl | 2 +- sitemaps/phdru.name-config.xml | 4 ++-- 8 files changed, 18 insertions(+), 18 deletions(-) diff --git a/README.html b/README.html index 96f5f0b..bb8447e 100644 --- a/README.html +++ b/README.html @@ -1,2 +1,2 @@ -phdru.name - +phdru.name - scripts I use to manage phdru.name. diff --git a/atom_10.tmpl b/atom_10.tmpl index c8bb7db..6839121 100644 --- a/atom_10.tmpl +++ b/atom_10.tmpl @@ -10,7 +10,7 @@ $author $email - http://phdru.name/about/make/${generator}.txt + https://phdru.name/about/make/${generator}.txt #for $post in $posts $post.title diff --git a/make-news.py b/make-news.py index 6d6ab7d..35cf42d 100755 --- a/make-news.py +++ b/make-news.py @@ -57,7 +57,7 @@ write_if_changed(os.path.join(root, "news.tmpl"), ''.join(new_text)) namespace = { "title": "Oleg Broytman's Personal Page - News", - "baseURL": "http://phdru.name/", + "baseURL": "https://phdru.name/", "indexFile": "news.html", "description": "", "lang": lang, @@ -69,7 +69,7 @@ namespace = { if lang == "ru": namespace["title"] = "Oleg Broytman's Personal Page - Russian News" - namespace["baseURL"] = baseURL = "http://phdru.name/Russian/" + namespace["baseURL"] = baseURL = "https://phdru.name/Russian/" for item in news_items: item.baseURL = baseURL if isinstance(item.title, bytes): diff --git a/news.py b/news.py index 82c5c10..4f62778 100644 --- a/news.py +++ b/news.py @@ -23,7 +23,7 @@ except NameError: # PY3 return std_open(fname, mode, encoding='koi8-r') class NewsItem(object): - baseURL = "http://phdru.name/" + baseURL = "https://phdru.name/" excerpt = None content = None categoryList = [] diff --git a/phd_site.tmpl b/phd_site.tmpl index 9f6422d..0568b49 100644 --- a/phd_site.tmpl +++ b/phd_site.tmpl @@ -27,7 +27,7 @@ #else #end if - + $Title #if $Refresh: @@ -53,7 +53,7 @@ #end if - + @@ -100,10 +100,10 @@ $style #end if #if not $root and $path.endswith('index.html') - - - - + + + + #end if @@ -174,14 +174,14 @@ $link_tag($tag) #set $path = $path[:-len("index.html")] #end if #if $path.startswith("/Russian/") -

üÔÁ ÓÔÒÁÎÉÃÁ http://phdru.name$path +

üÔÁ ÓÔÒÁÎÉÃÁ https://phdru.name$path ÂÙÌÁ ÓÇÅÎÅÒÉÒÏ×ÁÎÁ $time.strftime("%d.%m.%Y", $local_time) × $time.strftime("%T", $local_time) ÉÚ ÛÁÂÌÏÎÁ CheetahTemplate $_fileBaseName; îÅËÏÔÏÒÙÅ ÐÒÁ×Á ÚÁÒÅÚÅÒ×ÉÒÏ×ÁÎÙ. ÷Ù ÍÏÖÅÔÅ ÕÚÎÁÔØ Ï ÔÅÈÎÉÞÅÓËÉÈ ÁÓÐÅËÔÁÈ ÜÔÏÇÏ ÓÁÊÔÁ.

#else -

This is the page http://phdru.name$path. +

This is the page https://phdru.name$path. It was generated on $last_modified_en from CheetahTemplate $_fileBaseName. Some rights are reserved. Read more about technical aspects of the site. diff --git a/reindex_blog.py b/reindex_blog.py index ab257d5..291e182 100755 --- a/reindex_blog.py +++ b/reindex_blog.py @@ -527,9 +527,9 @@ from news import NewsItem if blog_root: blog_root_url = blog_root[ blog_root.find('/htdocs/phdru.name/') + len('/htdocs/phdru.name/'):] - baseURL = "http://phdru.name/%s/" % blog_root_url + baseURL = "https://phdru.name/%s/" % blog_root_url else: - baseURL = "http://phdru.name/" + baseURL = "https://phdru.name/" items = [] for item in tuple(reversed(all_titles_tags))[:10]: diff --git a/rss_20.tmpl b/rss_20.tmpl index 9719df8..0f22a6d 100644 --- a/rss_20.tmpl +++ b/rss_20.tmpl @@ -7,7 +7,7 @@ $lang $author <$email> ${posts[0].rfc822_date} - http://phdru.name/about/make/${generator}.txt + https://phdru.name/about/make/${generator}.txt #for $post in $posts $post.title diff --git a/sitemaps/phdru.name-config.xml b/sitemaps/phdru.name-config.xml index c2e98c3..d47517c 100644 --- a/sitemaps/phdru.name-config.xml +++ b/sitemaps/phdru.name-config.xml @@ -4,7 +4,7 @@ --> -- 2.39.2