diff --git a/_config.yml b/_config.yml index 9f191fa4ba8..a3e929d28f5 100644 --- a/_config.yml +++ b/_config.yml @@ -85,9 +85,9 @@ pageviews: # theme_mode: # [light | dark] -# The CDN endpoint for images. +# The CDN endpoint for media resources. # Notice that once it is assigned, the CDN url -# will be added to all image (site avatar & posts' images) paths starting with '/' +# will be added to all media resources (site avatar, posts' images, audio and video files) paths starting with '/' # # e.g. 'https://cdn.com' # img_cdn: 'https://github.com' diff --git a/_includes/embed/audio.html b/_includes/embed/audio.html index d618890af2f..e2b897901e2 100644 --- a/_includes/embed/audio.html +++ b/_includes/embed/audio.html @@ -4,7 +4,7 @@ {% unless src contains '://' %} {%- capture src -%} - {% include img-url.html src=src %} + {% include media-url.html src=src %} {%- endcapture -%} {% endunless %} diff --git a/_includes/embed/video.html b/_includes/embed/video.html index 72ec4fbeb69..712a266a345 100644 --- a/_includes/embed/video.html +++ b/_includes/embed/video.html @@ -5,14 +5,14 @@ {% unless video_url contains '://' %} {%- capture video_url -%} - {% include img-url.html src=video_url %} + {% include media-url.html src=video_url %} {%- endcapture -%} {% endunless %} {% if poster_url %} {% unless poster_url contains '://' %} {%- capture poster_url -%} - {% include img-url.html src=poster_url img_path=page.img_path %} + {% include media-url.html src=poster_url subpath=page.media_subpath %} {%- endcapture -%} {% endunless %} {% assign poster = 'poster="' | append: poster_url | append: '"' %} diff --git a/_includes/head.html b/_includes/head.html index e0f6b469ef9..d1ec5fb6f39 100644 --- a/_includes/head.html +++ b/_includes/head.html @@ -20,7 +20,7 @@ {% unless src contains '://' %} {%- capture img_url -%} - {% include img-url.html src=src img_path=page.img_path absolute=true %} + {% include media-url.html src=src subpath=page.media_subpath absolute=true %} {%- endcapture -%} {%- capture old_url -%}{{ src | absolute_url }}{%- endcapture -%} @@ -31,7 +31,7 @@ {% elsif site.social_preview_image %} {%- capture img_url -%} - {% include img-url.html src=site.social_preview_image absolute=true %} + {% include media-url.html src=site.social_preview_image absolute=true %} {%- endcapture -%} {%- capture og_image -%} diff --git a/_includes/img-url.html b/_includes/media-url.html similarity index 59% rename from _includes/img-url.html rename to _includes/media-url.html index bb4758c72d3..ea410750268 100644 --- a/_includes/img-url.html +++ b/_includes/media-url.html @@ -1,25 +1,25 @@ {%- comment -%} - Generate image final URL based on `site.img_cdn`, `page.img_path` + Generate media resource final URL based on `site.cdn`, `page.media_subpath` Arguments: - src - required, basic image path - img_path - optional, relative path of image + src - required, basic media resources path + subpath - optional, relative path of media resources absolute - optional, boolean, if true, generate absolute URL Return: - image URL + media resources URL {%- endcomment -%} {% assign url = include.src %} {%- if url -%} {% unless url contains ':' %} - {%- comment -%} Add page image path prefix {%- endcomment -%} - {% assign url = include.img_path | default: '' | append: '/' | append: url %} + {%- comment -%} Add media resources subpath prefix {%- endcomment -%} + {% assign url = include.subpath | default: '' | append: '/' | append: url %} {%- comment -%} Prepend CND URL {%- endcomment -%} - {% if site.img_cdn %} - {% assign url = site.img_cdn | append: '/' | append: url %} + {% if site.cdn %} + {% assign url = site.cdn | append: '/' | append: url %} {% endif %} {% assign url = url | replace: '///', '/' | replace: '//', '/' | replace: ':/', '://' %} diff --git a/_includes/refactor-content.html b/_includes/refactor-content.html index e4abcbc2a51..8d298cde6c0 100644 --- a/_includes/refactor-content.html +++ b/_includes/refactor-content.html @@ -97,7 +97,7 @@ {% assign _lazyload = true %} {%- capture _img_url -%} - {% include img-url.html src=_src img_path=page.img_path %} + {% include media-url.html src=_src subpath=page.media_subpath %} {%- endcapture -%} {% assign _path_prefix = _img_url | remove: _src %} diff --git a/_includes/sidebar.html b/_includes/sidebar.html index 069bbc95b24..e10d41b3457 100644 --- a/_includes/sidebar.html +++ b/_includes/sidebar.html @@ -5,7 +5,7 @@ {%- if site.avatar != empty and site.avatar -%} {%- capture avatar_url -%} - {% include img-url.html src=site.avatar %} + {% include media-url.html src=site.avatar %} {%- endcapture -%} avatar {%- endif -%} diff --git a/_layouts/home.html b/_layouts/home.html index a9f5bd366a7..e44efe8f4cb 100644 --- a/_layouts/home.html +++ b/_layouts/home.html @@ -49,7 +49,7 @@ {% if post.image %} {% assign src = post.image.path | default: post.image %} {% unless src contains '//' %} - {% assign src = post.img_path | append: '/' | append: src | replace: '//', '/' %} + {% assign src = post.media_subpath | append: '/' | append: src | replace: '//', '/' %} {% endunless %} {% assign alt = post.image.alt | xml_escape | default: 'Preview Image' %} diff --git a/assets/js/data/swconf.js b/assets/js/data/swconf.js index cc11f79c750..c02638fa5e1 100644 --- a/assets/js/data/swconf.js +++ b/assets/js/data/swconf.js @@ -24,8 +24,8 @@ const swconf = { {%- comment -%} The request url with below domain will be cached. {%- endcomment -%} allowHosts: [ - {% if site.img_cdn and site.img_cdn contains '//' %} - '{{ site.img_cdn | split: '//' | last | split: '/' | first }}', + {% if site.cdn and site.cdn contains '//' %} + '{{ site.cdn | split: '//' | last | split: '/' | first }}', {% endif %} {%- unless site.assets.self_host.enabled -%} diff --git a/tools/init b/tools/init index 5baac5d829c..bf1ef85871e 100755 --- a/tools/init +++ b/tools/init @@ -93,7 +93,7 @@ init_files() { mv ./${ACTIONS_WORKFLOW}.hook .github/workflows/${ACTIONS_WORKFLOW} ## Cleanup image settings in site config - _sedi "s/^img_cdn:.*/img_cdn:/;s/^avatar:.*/avatar:/" _config.yml + _sedi "s/^cdn:.*/cdn:/;s/^avatar:.*/avatar:/" _config.yml fi # remove the other files diff --git a/tools/release b/tools/release index 9ca63dccce4..965828bd541 100755 --- a/tools/release +++ b/tools/release @@ -156,7 +156,7 @@ build_gem() { git checkout "$PROD_BRANCH" # Remove unnecessary theme settings - sed -i "s/^img_cdn:.*/img_cdn:/;s/^avatar:.*/avatar:/" _config.yml + sed -i "s/^cdn:.*/cdn:/;s/^avatar:.*/avatar:/" _config.yml rm -f ./*.gem npm run build