From 8546e1e42cd904024f342ea4e51be0c72a67c6e0 Mon Sep 17 00:00:00 2001 From: Luke Murphy Date: Wed, 19 Jun 2019 11:56:28 +0200 Subject: [PATCH] Restore pelican configuration conventions Attempting to fix my mess! --- .../prosody => downloads}/prosody.0.11.cfg.lua | 0 .../prosody => downloads}/prosody.0.9.cfg.lua | 0 .../prosody => downloads}/prosody.10.cfg.lua | 0 .../{staticfiles/configs/site => extra}/favicon.ico | Bin .../syndication => extra}/featured_image_blue.png | Bin .../images/xmpp-msgr => extra}/omemo.png | Bin .../{staticfiles/configs/site => extra}/robots.txt | 0 .../{staticfiles => }/images/about/chooser_by.png | Bin .../{staticfiles => }/images/about/chooser_cc.png | Bin .../{staticfiles => }/images/about/chooser_sa.png | Bin .../images/about/seal_of_freedom.png | Bin .../lowtech-solar/international-switchboard.jpg | Bin .../lowtech-solar/international-switchboard11.png | Bin .../lowtech-solar/international-switchboard3.png | Bin .../lowtech-solar/international-switchboard6.png | Bin .../images/lowtech-solar/lime2.png | Bin .../images/lowtech-solar/off-line-reading.png | Bin .../{staticfiles => }/images/nas/nas_a10_olimex.JPG | Bin .../images/nas/nas_sata_cables.JPG | Bin .../images/nas/nas_storage_media.JPG | Bin content/{staticfiles => }/images/nas/sps_close.png | Bin content/{staticfiles => }/images/nas/sps_panel.png | Bin content/{staticfiles => }/images/nas/sps_wide.png | Bin .../images/port-forwarding/port_forwarding.svg | 0 .../{staticfiles => }/images/xmpp-msgr/conv_1.png | Bin .../{staticfiles => }/images/xmpp-msgr/conv_2.png | Bin .../{staticfiles => }/images/xmpp-msgr/conv_3.png | Bin .../{staticfiles => }/images/xmpp-msgr/conv_4.png | Bin .../{staticfiles => }/images/xmpp-msgr/conv_5.png | Bin content/{staticfiles => }/images/xmpp-msgr/cs_1.png | Bin .../{staticfiles => }/images/xmpp-msgr/cs_10.png | Bin .../{staticfiles => }/images/xmpp-msgr/cs_11.png | Bin .../{staticfiles => }/images/xmpp-msgr/cs_12.png | Bin .../{staticfiles => }/images/xmpp-msgr/cs_13.png | Bin .../{staticfiles => }/images/xmpp-msgr/cs_14.png | Bin .../{staticfiles => }/images/xmpp-msgr/cs_15.png | Bin .../{staticfiles => }/images/xmpp-msgr/cs_16.png | Bin .../{staticfiles => }/images/xmpp-msgr/cs_17.png | Bin .../{staticfiles => }/images/xmpp-msgr/cs_18.png | Bin .../{staticfiles => }/images/xmpp-msgr/cs_19.png | Bin content/{staticfiles => }/images/xmpp-msgr/cs_2.png | Bin .../{staticfiles => }/images/xmpp-msgr/cs_20.png | Bin content/{staticfiles => }/images/xmpp-msgr/cs_3.png | Bin content/{staticfiles => }/images/xmpp-msgr/cs_4.png | Bin content/{staticfiles => }/images/xmpp-msgr/cs_5.png | Bin content/{staticfiles => }/images/xmpp-msgr/cs_6.png | Bin content/{staticfiles => }/images/xmpp-msgr/cs_7.png | Bin content/{staticfiles => }/images/xmpp-msgr/cs_8.png | Bin content/{staticfiles => }/images/xmpp-msgr/cs_9.png | Bin .../{staticfiles => }/images/xmpp-msgr/gajim_1.png | Bin .../{staticfiles => }/images/xmpp-msgr/gajim_2.png | Bin .../{staticfiles => }/images/xmpp-msgr/gajim_3.png | Bin .../{staticfiles => }/images/xmpp-msgr/gajim_4.png | Bin .../{staticfiles => }/images/xmpp-msgr/gajim_5.png | Bin .../{staticfiles => }/images/xmpp-msgr/gajim_6.png | Bin pelicanconf.py | 8 +++++--- 56 files changed, 5 insertions(+), 3 deletions(-) rename content/{staticfiles/configs/prosody => downloads}/prosody.0.11.cfg.lua (100%) rename content/{staticfiles/configs/prosody => downloads}/prosody.0.9.cfg.lua (100%) rename content/{staticfiles/configs/prosody => downloads}/prosody.10.cfg.lua (100%) rename content/{staticfiles/configs/site => extra}/favicon.ico (100%) rename content/{staticfiles/images/syndication => extra}/featured_image_blue.png (100%) rename content/{staticfiles/images/xmpp-msgr => extra}/omemo.png (100%) rename content/{staticfiles/configs/site => extra}/robots.txt (100%) rename content/{staticfiles => }/images/about/chooser_by.png (100%) rename content/{staticfiles => }/images/about/chooser_cc.png (100%) rename content/{staticfiles => }/images/about/chooser_sa.png (100%) rename content/{staticfiles => }/images/about/seal_of_freedom.png (100%) rename content/{staticfiles => }/images/lowtech-solar/international-switchboard.jpg (100%) rename content/{staticfiles => }/images/lowtech-solar/international-switchboard11.png (100%) rename content/{staticfiles => }/images/lowtech-solar/international-switchboard3.png (100%) rename content/{staticfiles => }/images/lowtech-solar/international-switchboard6.png (100%) rename content/{staticfiles => }/images/lowtech-solar/lime2.png (100%) rename content/{staticfiles => }/images/lowtech-solar/off-line-reading.png (100%) rename content/{staticfiles => }/images/nas/nas_a10_olimex.JPG (100%) rename content/{staticfiles => }/images/nas/nas_sata_cables.JPG (100%) rename content/{staticfiles => }/images/nas/nas_storage_media.JPG (100%) rename content/{staticfiles => }/images/nas/sps_close.png (100%) rename content/{staticfiles => }/images/nas/sps_panel.png (100%) rename content/{staticfiles => }/images/nas/sps_wide.png (100%) rename content/{staticfiles => }/images/port-forwarding/port_forwarding.svg (100%) rename content/{staticfiles => }/images/xmpp-msgr/conv_1.png (100%) rename content/{staticfiles => }/images/xmpp-msgr/conv_2.png (100%) rename content/{staticfiles => }/images/xmpp-msgr/conv_3.png (100%) rename content/{staticfiles => }/images/xmpp-msgr/conv_4.png (100%) rename content/{staticfiles => }/images/xmpp-msgr/conv_5.png (100%) rename content/{staticfiles => }/images/xmpp-msgr/cs_1.png (100%) rename content/{staticfiles => }/images/xmpp-msgr/cs_10.png (100%) rename content/{staticfiles => }/images/xmpp-msgr/cs_11.png (100%) rename content/{staticfiles => }/images/xmpp-msgr/cs_12.png (100%) rename content/{staticfiles => }/images/xmpp-msgr/cs_13.png (100%) rename content/{staticfiles => }/images/xmpp-msgr/cs_14.png (100%) rename content/{staticfiles => }/images/xmpp-msgr/cs_15.png (100%) rename content/{staticfiles => }/images/xmpp-msgr/cs_16.png (100%) rename content/{staticfiles => }/images/xmpp-msgr/cs_17.png (100%) rename content/{staticfiles => }/images/xmpp-msgr/cs_18.png (100%) rename content/{staticfiles => }/images/xmpp-msgr/cs_19.png (100%) rename content/{staticfiles => }/images/xmpp-msgr/cs_2.png (100%) rename content/{staticfiles => }/images/xmpp-msgr/cs_20.png (100%) rename content/{staticfiles => }/images/xmpp-msgr/cs_3.png (100%) rename content/{staticfiles => }/images/xmpp-msgr/cs_4.png (100%) rename content/{staticfiles => }/images/xmpp-msgr/cs_5.png (100%) rename content/{staticfiles => }/images/xmpp-msgr/cs_6.png (100%) rename content/{staticfiles => }/images/xmpp-msgr/cs_7.png (100%) rename content/{staticfiles => }/images/xmpp-msgr/cs_8.png (100%) rename content/{staticfiles => }/images/xmpp-msgr/cs_9.png (100%) rename content/{staticfiles => }/images/xmpp-msgr/gajim_1.png (100%) rename content/{staticfiles => }/images/xmpp-msgr/gajim_2.png (100%) rename content/{staticfiles => }/images/xmpp-msgr/gajim_3.png (100%) rename content/{staticfiles => }/images/xmpp-msgr/gajim_4.png (100%) rename content/{staticfiles => }/images/xmpp-msgr/gajim_5.png (100%) rename content/{staticfiles => }/images/xmpp-msgr/gajim_6.png (100%) diff --git a/content/staticfiles/configs/prosody/prosody.0.11.cfg.lua b/content/downloads/prosody.0.11.cfg.lua similarity index 100% rename from content/staticfiles/configs/prosody/prosody.0.11.cfg.lua rename to content/downloads/prosody.0.11.cfg.lua diff --git a/content/staticfiles/configs/prosody/prosody.0.9.cfg.lua b/content/downloads/prosody.0.9.cfg.lua similarity index 100% rename from content/staticfiles/configs/prosody/prosody.0.9.cfg.lua rename to content/downloads/prosody.0.9.cfg.lua diff --git a/content/staticfiles/configs/prosody/prosody.10.cfg.lua b/content/downloads/prosody.10.cfg.lua similarity index 100% rename from content/staticfiles/configs/prosody/prosody.10.cfg.lua rename to content/downloads/prosody.10.cfg.lua diff --git a/content/staticfiles/configs/site/favicon.ico b/content/extra/favicon.ico similarity index 100% rename from content/staticfiles/configs/site/favicon.ico rename to content/extra/favicon.ico diff --git a/content/staticfiles/images/syndication/featured_image_blue.png b/content/extra/featured_image_blue.png similarity index 100% rename from content/staticfiles/images/syndication/featured_image_blue.png rename to content/extra/featured_image_blue.png diff --git a/content/staticfiles/images/xmpp-msgr/omemo.png b/content/extra/omemo.png similarity index 100% rename from content/staticfiles/images/xmpp-msgr/omemo.png rename to content/extra/omemo.png diff --git a/content/staticfiles/configs/site/robots.txt b/content/extra/robots.txt similarity index 100% rename from content/staticfiles/configs/site/robots.txt rename to content/extra/robots.txt diff --git a/content/staticfiles/images/about/chooser_by.png b/content/images/about/chooser_by.png similarity index 100% rename from content/staticfiles/images/about/chooser_by.png rename to content/images/about/chooser_by.png diff --git a/content/staticfiles/images/about/chooser_cc.png b/content/images/about/chooser_cc.png similarity index 100% rename from content/staticfiles/images/about/chooser_cc.png rename to content/images/about/chooser_cc.png diff --git a/content/staticfiles/images/about/chooser_sa.png b/content/images/about/chooser_sa.png similarity index 100% rename from content/staticfiles/images/about/chooser_sa.png rename to content/images/about/chooser_sa.png diff --git a/content/staticfiles/images/about/seal_of_freedom.png b/content/images/about/seal_of_freedom.png similarity index 100% rename from content/staticfiles/images/about/seal_of_freedom.png rename to content/images/about/seal_of_freedom.png diff --git a/content/staticfiles/images/lowtech-solar/international-switchboard.jpg b/content/images/lowtech-solar/international-switchboard.jpg similarity index 100% rename from content/staticfiles/images/lowtech-solar/international-switchboard.jpg rename to content/images/lowtech-solar/international-switchboard.jpg diff --git a/content/staticfiles/images/lowtech-solar/international-switchboard11.png b/content/images/lowtech-solar/international-switchboard11.png similarity index 100% rename from content/staticfiles/images/lowtech-solar/international-switchboard11.png rename to content/images/lowtech-solar/international-switchboard11.png diff --git a/content/staticfiles/images/lowtech-solar/international-switchboard3.png b/content/images/lowtech-solar/international-switchboard3.png similarity index 100% rename from content/staticfiles/images/lowtech-solar/international-switchboard3.png rename to content/images/lowtech-solar/international-switchboard3.png diff --git a/content/staticfiles/images/lowtech-solar/international-switchboard6.png b/content/images/lowtech-solar/international-switchboard6.png similarity index 100% rename from content/staticfiles/images/lowtech-solar/international-switchboard6.png rename to content/images/lowtech-solar/international-switchboard6.png diff --git a/content/staticfiles/images/lowtech-solar/lime2.png b/content/images/lowtech-solar/lime2.png similarity index 100% rename from content/staticfiles/images/lowtech-solar/lime2.png rename to content/images/lowtech-solar/lime2.png diff --git a/content/staticfiles/images/lowtech-solar/off-line-reading.png b/content/images/lowtech-solar/off-line-reading.png similarity index 100% rename from content/staticfiles/images/lowtech-solar/off-line-reading.png rename to content/images/lowtech-solar/off-line-reading.png diff --git a/content/staticfiles/images/nas/nas_a10_olimex.JPG b/content/images/nas/nas_a10_olimex.JPG similarity index 100% rename from content/staticfiles/images/nas/nas_a10_olimex.JPG rename to content/images/nas/nas_a10_olimex.JPG diff --git a/content/staticfiles/images/nas/nas_sata_cables.JPG b/content/images/nas/nas_sata_cables.JPG similarity index 100% rename from content/staticfiles/images/nas/nas_sata_cables.JPG rename to content/images/nas/nas_sata_cables.JPG diff --git a/content/staticfiles/images/nas/nas_storage_media.JPG b/content/images/nas/nas_storage_media.JPG similarity index 100% rename from content/staticfiles/images/nas/nas_storage_media.JPG rename to content/images/nas/nas_storage_media.JPG diff --git a/content/staticfiles/images/nas/sps_close.png b/content/images/nas/sps_close.png similarity index 100% rename from content/staticfiles/images/nas/sps_close.png rename to content/images/nas/sps_close.png diff --git a/content/staticfiles/images/nas/sps_panel.png b/content/images/nas/sps_panel.png similarity index 100% rename from content/staticfiles/images/nas/sps_panel.png rename to content/images/nas/sps_panel.png diff --git a/content/staticfiles/images/nas/sps_wide.png b/content/images/nas/sps_wide.png similarity index 100% rename from content/staticfiles/images/nas/sps_wide.png rename to content/images/nas/sps_wide.png diff --git a/content/staticfiles/images/port-forwarding/port_forwarding.svg b/content/images/port-forwarding/port_forwarding.svg similarity index 100% rename from content/staticfiles/images/port-forwarding/port_forwarding.svg rename to content/images/port-forwarding/port_forwarding.svg diff --git a/content/staticfiles/images/xmpp-msgr/conv_1.png b/content/images/xmpp-msgr/conv_1.png similarity index 100% rename from content/staticfiles/images/xmpp-msgr/conv_1.png rename to content/images/xmpp-msgr/conv_1.png diff --git a/content/staticfiles/images/xmpp-msgr/conv_2.png b/content/images/xmpp-msgr/conv_2.png similarity index 100% rename from content/staticfiles/images/xmpp-msgr/conv_2.png rename to content/images/xmpp-msgr/conv_2.png diff --git a/content/staticfiles/images/xmpp-msgr/conv_3.png b/content/images/xmpp-msgr/conv_3.png similarity index 100% rename from content/staticfiles/images/xmpp-msgr/conv_3.png rename to content/images/xmpp-msgr/conv_3.png diff --git a/content/staticfiles/images/xmpp-msgr/conv_4.png b/content/images/xmpp-msgr/conv_4.png similarity index 100% rename from content/staticfiles/images/xmpp-msgr/conv_4.png rename to content/images/xmpp-msgr/conv_4.png diff --git a/content/staticfiles/images/xmpp-msgr/conv_5.png b/content/images/xmpp-msgr/conv_5.png similarity index 100% rename from content/staticfiles/images/xmpp-msgr/conv_5.png rename to content/images/xmpp-msgr/conv_5.png diff --git a/content/staticfiles/images/xmpp-msgr/cs_1.png b/content/images/xmpp-msgr/cs_1.png similarity index 100% rename from content/staticfiles/images/xmpp-msgr/cs_1.png rename to content/images/xmpp-msgr/cs_1.png diff --git a/content/staticfiles/images/xmpp-msgr/cs_10.png b/content/images/xmpp-msgr/cs_10.png similarity index 100% rename from content/staticfiles/images/xmpp-msgr/cs_10.png rename to content/images/xmpp-msgr/cs_10.png diff --git a/content/staticfiles/images/xmpp-msgr/cs_11.png b/content/images/xmpp-msgr/cs_11.png similarity index 100% rename from content/staticfiles/images/xmpp-msgr/cs_11.png rename to content/images/xmpp-msgr/cs_11.png diff --git a/content/staticfiles/images/xmpp-msgr/cs_12.png b/content/images/xmpp-msgr/cs_12.png similarity index 100% rename from content/staticfiles/images/xmpp-msgr/cs_12.png rename to content/images/xmpp-msgr/cs_12.png diff --git a/content/staticfiles/images/xmpp-msgr/cs_13.png b/content/images/xmpp-msgr/cs_13.png similarity index 100% rename from content/staticfiles/images/xmpp-msgr/cs_13.png rename to content/images/xmpp-msgr/cs_13.png diff --git a/content/staticfiles/images/xmpp-msgr/cs_14.png b/content/images/xmpp-msgr/cs_14.png similarity index 100% rename from content/staticfiles/images/xmpp-msgr/cs_14.png rename to content/images/xmpp-msgr/cs_14.png diff --git a/content/staticfiles/images/xmpp-msgr/cs_15.png b/content/images/xmpp-msgr/cs_15.png similarity index 100% rename from content/staticfiles/images/xmpp-msgr/cs_15.png rename to content/images/xmpp-msgr/cs_15.png diff --git a/content/staticfiles/images/xmpp-msgr/cs_16.png b/content/images/xmpp-msgr/cs_16.png similarity index 100% rename from content/staticfiles/images/xmpp-msgr/cs_16.png rename to content/images/xmpp-msgr/cs_16.png diff --git a/content/staticfiles/images/xmpp-msgr/cs_17.png b/content/images/xmpp-msgr/cs_17.png similarity index 100% rename from content/staticfiles/images/xmpp-msgr/cs_17.png rename to content/images/xmpp-msgr/cs_17.png diff --git a/content/staticfiles/images/xmpp-msgr/cs_18.png b/content/images/xmpp-msgr/cs_18.png similarity index 100% rename from content/staticfiles/images/xmpp-msgr/cs_18.png rename to content/images/xmpp-msgr/cs_18.png diff --git a/content/staticfiles/images/xmpp-msgr/cs_19.png b/content/images/xmpp-msgr/cs_19.png similarity index 100% rename from content/staticfiles/images/xmpp-msgr/cs_19.png rename to content/images/xmpp-msgr/cs_19.png diff --git a/content/staticfiles/images/xmpp-msgr/cs_2.png b/content/images/xmpp-msgr/cs_2.png similarity index 100% rename from content/staticfiles/images/xmpp-msgr/cs_2.png rename to content/images/xmpp-msgr/cs_2.png diff --git a/content/staticfiles/images/xmpp-msgr/cs_20.png b/content/images/xmpp-msgr/cs_20.png similarity index 100% rename from content/staticfiles/images/xmpp-msgr/cs_20.png rename to content/images/xmpp-msgr/cs_20.png diff --git a/content/staticfiles/images/xmpp-msgr/cs_3.png b/content/images/xmpp-msgr/cs_3.png similarity index 100% rename from content/staticfiles/images/xmpp-msgr/cs_3.png rename to content/images/xmpp-msgr/cs_3.png diff --git a/content/staticfiles/images/xmpp-msgr/cs_4.png b/content/images/xmpp-msgr/cs_4.png similarity index 100% rename from content/staticfiles/images/xmpp-msgr/cs_4.png rename to content/images/xmpp-msgr/cs_4.png diff --git a/content/staticfiles/images/xmpp-msgr/cs_5.png b/content/images/xmpp-msgr/cs_5.png similarity index 100% rename from content/staticfiles/images/xmpp-msgr/cs_5.png rename to content/images/xmpp-msgr/cs_5.png diff --git a/content/staticfiles/images/xmpp-msgr/cs_6.png b/content/images/xmpp-msgr/cs_6.png similarity index 100% rename from content/staticfiles/images/xmpp-msgr/cs_6.png rename to content/images/xmpp-msgr/cs_6.png diff --git a/content/staticfiles/images/xmpp-msgr/cs_7.png b/content/images/xmpp-msgr/cs_7.png similarity index 100% rename from content/staticfiles/images/xmpp-msgr/cs_7.png rename to content/images/xmpp-msgr/cs_7.png diff --git a/content/staticfiles/images/xmpp-msgr/cs_8.png b/content/images/xmpp-msgr/cs_8.png similarity index 100% rename from content/staticfiles/images/xmpp-msgr/cs_8.png rename to content/images/xmpp-msgr/cs_8.png diff --git a/content/staticfiles/images/xmpp-msgr/cs_9.png b/content/images/xmpp-msgr/cs_9.png similarity index 100% rename from content/staticfiles/images/xmpp-msgr/cs_9.png rename to content/images/xmpp-msgr/cs_9.png diff --git a/content/staticfiles/images/xmpp-msgr/gajim_1.png b/content/images/xmpp-msgr/gajim_1.png similarity index 100% rename from content/staticfiles/images/xmpp-msgr/gajim_1.png rename to content/images/xmpp-msgr/gajim_1.png diff --git a/content/staticfiles/images/xmpp-msgr/gajim_2.png b/content/images/xmpp-msgr/gajim_2.png similarity index 100% rename from content/staticfiles/images/xmpp-msgr/gajim_2.png rename to content/images/xmpp-msgr/gajim_2.png diff --git a/content/staticfiles/images/xmpp-msgr/gajim_3.png b/content/images/xmpp-msgr/gajim_3.png similarity index 100% rename from content/staticfiles/images/xmpp-msgr/gajim_3.png rename to content/images/xmpp-msgr/gajim_3.png diff --git a/content/staticfiles/images/xmpp-msgr/gajim_4.png b/content/images/xmpp-msgr/gajim_4.png similarity index 100% rename from content/staticfiles/images/xmpp-msgr/gajim_4.png rename to content/images/xmpp-msgr/gajim_4.png diff --git a/content/staticfiles/images/xmpp-msgr/gajim_5.png b/content/images/xmpp-msgr/gajim_5.png similarity index 100% rename from content/staticfiles/images/xmpp-msgr/gajim_5.png rename to content/images/xmpp-msgr/gajim_5.png diff --git a/content/staticfiles/images/xmpp-msgr/gajim_6.png b/content/images/xmpp-msgr/gajim_6.png similarity index 100% rename from content/staticfiles/images/xmpp-msgr/gajim_6.png rename to content/images/xmpp-msgr/gajim_6.png diff --git a/pelicanconf.py b/pelicanconf.py index 973267d..d475a47 100644 --- a/pelicanconf.py +++ b/pelicanconf.py @@ -22,8 +22,10 @@ DEFAULT_PAGINATION = False THEME = 'themes/homebrewtheme' -STATIC_PATHS = ['staticfiles'] - -#ARTICLE_PATHS = ['articles'] +STATIC_PATHS = ( + 'images', + 'downloads', + 'extra', +) DISPLAY_CATEGORIES_ON_MENU = True