Skip to content

Commit bdf8650

Browse files
committed
base URL is not needed anymore
no develop branch from now and on Signed-off-by: Hofi <hofione@gmail.com>
1 parent 98faa66 commit bdf8650

File tree

3 files changed

+23
-17
lines changed

3 files changed

+23
-17
lines changed

.github/workflows/jekyll-gh-pages.yml

+9-9
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ name: Deploy Jekyll site to Pages
99
on:
1010
# Runs on pushes targeting the default branch
1111
push:
12-
branches: ["master", "develop"]
12+
branches: ["master"]
1313

1414
# Allows you to run this workflow manually from the Actions tab
1515
workflow_dispatch:
@@ -49,23 +49,23 @@ jobs:
4949
run: |
5050
echo "Updating navigation.yml"
5151
pwd
52-
53-
# Last param turns off jekyll build for the links, let it be done in the next step
52+
53+
# Last param turns off jekyll build for the links, let it be done in the next step
5454
# with the same parameters we use for the real site build
5555
#
5656
./_tools/navgen "./doc" "./_data/navigation.yml" "no"
57-
57+
5858
ls -Al _data/navigation.yml
5959
60-
# This one is just for sure to have our final scripts result inplace
60+
# This one is just for sure to have our final scripts result inplace
6161
# as in the following _site build step the assets/js folder will be modified unfortunately
6262
# Theoretically, the site build will not hurt the already presented files
6363
# See bellow for more
6464
#
6565
echo "Updating main.min.js and re-pack js scripts"
6666
pwd
67-
68-
./_tools/pack debug
67+
68+
./_tools/pack debug
6969
ls -AlR assets/js
7070
7171
- name: Build with Jekyll
@@ -78,7 +78,7 @@ jobs:
7878
7979
JEKYLL_BUILD_TOOLTIPS=yes bundle exec jekyll build --baseurl "${{ steps.pages.outputs.base_path }}"
8080
81-
ls -AlR ./_site/assets/js
81+
ls -AlR ./_site/assets/js
8282
env:
8383
JEKYLL_ENV: production
8484

@@ -92,7 +92,7 @@ jobs:
9292
run: |
9393
echo "Updating main.min.js and re-pack js scripts"
9494
pwd
95-
95+
9696
./_tools/pack debug
9797
ls -AlR _site/assets/js
9898

_config.yml

+8-8
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ whitelist:
3232

3333
# Reading Files
3434
#
35-
# Every file or directory beginning with the following characters:
36-
# ., _ , # or ~
37-
# in the source directory will not be included in the destination folder. Such paths will have to be explicitly specified via the config file in the
35+
# Every file or directory beginning with the following characters:
36+
# ., _ , # or ~
37+
# in the source directory will not be included in the destination folder. Such paths will have to be explicitly specified via the config file in the
3838
# include directive to make sure they’re copied over
3939
# In Jekyll 3, the `exclude` configuration option replaces the default exclusion list.
4040
# In Jekyll 4, user-provided entries get added to the default exclusion list instead and the `include` option can be used to override the default exclusion list entries.
@@ -62,7 +62,7 @@ exclude:
6262
# TODO: These are now packed into assets/js/main.min.js, not needed, but the _site building still adds them, double check the references why
6363
# Also the doc snippet above is lieing, if this is presented the include: will not add e.g. assets/js/lunr even it is presented over there
6464
#- assets/js
65-
- _js/
65+
- _js/
6666
- _tools/
6767
- Gemfile
6868
- Gemfile.lock
@@ -76,7 +76,7 @@ sass:
7676
sass_dir: _sass/minimal-mistakes
7777
style: compressed # https://sass-lang.com/documentation/file.SASS_REFERENCE.html#output_style
7878

79-
# Note: If you assign footer_scripts the theme’s /assets/js/main.min.js file will be deactivated.
79+
# Note: If you assign footer_scripts the theme’s /assets/js/main.min.js file will be deactivated.
8080
# This script includes jQuery and various other plugins that you’ll need to find replacements for and include separately.
8181
# https://mmistakes.github.io/minimal-mistakes/docs/javascript/
8282
#
@@ -98,7 +98,7 @@ author:
9898
# For user/organization pages set this to an empty string
9999
# When working locally use jekyll serve --baseurl '' so that you can view everything at localhost:4000
100100
# See http://jekyllrb.com/docs/github-pages/ or https://byparker.com/blog/2014/clearing-up-confusion-around-baseurl/ for more info
101-
baseurl: /doc
101+
baseurl:
102102

103103
# Point the logo URL at a file in your repo or hosted elsewhere by your organization
104104
logourl: /assets/images/favicons/mstile-150x150.png
@@ -157,7 +157,7 @@ defaults:
157157

158158
# Developer guide pages
159159
- scope:
160-
type: dev-guide
160+
type: dev-guide
161161
values:
162162
sidebar:
163163
nav: "dev-guide-nav"
@@ -178,7 +178,7 @@ lunr:
178178
# index_name: # YOUR_INDEX_NAME
179179
# search_only_api_key: # YOUR_SEARCH_ONLY_API_KEY
180180
# powered_by: # true (default), false
181-
181+
182182
# Markdown and sytax higlighting
183183
# https://jekyllrb.com/docs/configuration/markdown/
184184
markdown_ext: "markdown,mkdown,mkdn,mkd,md"

_data/navigation.yml

+6
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,9 @@ admin-guide-nav:
144144
url: /admin-guide/060_Sources/020_File/000_Notes_on_reading_kernel_messages
145145
- title: "file() source options"
146146
url: /admin-guide/060_Sources/020_File/001_File_source_options
147+
- title: "Arr logs"
148+
url: /admin-guide/060_Sources/025_Arr_logs/README
149+
subnav:
147150
- title: "wildcard-file"
148151
url: /admin-guide/060_Sources/030_Wildcard-file/README
149152
subnav:
@@ -202,6 +205,9 @@ admin-guide-nav:
202205
subnav:
203206
- title: "osquery() source options"
204207
url: /admin-guide/060_Sources/100_osquery/000_osquery_source_options
208+
- title: "Pi-hole FTL"
209+
url: /admin-guide/060_Sources/105_pi-hole-FTL/README
210+
subnav:
205211
- title: "pipe"
206212
url: /admin-guide/060_Sources/110_Pipe/README
207213
subnav:

0 commit comments

Comments
 (0)