diff options
author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2020-06-15 13:00:00 +0200 |
---|---|---|
committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2020-06-15 13:00:00 +0200 |
commit | 577d00ee5ea4c8851af2cd5811f0c8829db41178 (patch) | |
tree | be0f5ee83b871d4f1606c3b7be1281be0b2e3553 | |
parent | a295d69fcfabe64bd17ae05f1948505531ea99a2 (diff) | |
download | Nix-577d00ee5ea4c8851af2cd5811f0c8829db41178.tar.gz Nix-577d00ee5ea4c8851af2cd5811f0c8829db41178.tar.zst Nix-577d00ee5ea4c8851af2cd5811f0c8829db41178.zip |
Put history generator in separate repository
Thunderbird doesn’t like feed.xml at timestamp 1
31 files changed, 35 insertions, 939 deletions
diff --git a/history b/history deleted file mode 120000 index 4cec33c..0000000 --- a/history +++ /dev/null | |||
@@ -1 +0,0 @@ | |||
1 | modules/private/websites/immae/history/_posts \ No newline at end of file | ||
diff --git a/modules/private/buildbot/projects/immaeEu/__init__.py b/modules/private/buildbot/projects/immaeEu/__init__.py index bb880e5..575f083 100644 --- a/modules/private/buildbot/projects/immaeEu/__init__.py +++ b/modules/private/buildbot/projects/immaeEu/__init__.py | |||
@@ -17,6 +17,7 @@ class E(): | |||
17 | 17 | ||
18 | BIP39_GIT_URL = "https://git.immae.eu/perso/Immae/Projets/Cryptomonnaies/BIP39.git" | 18 | BIP39_GIT_URL = "https://git.immae.eu/perso/Immae/Projets/Cryptomonnaies/BIP39.git" |
19 | IMMAE_EU_GIT_URL = "gitolite@git.immae.eu:perso/Immae/Sites/Blog" | 19 | IMMAE_EU_GIT_URL = "gitolite@git.immae.eu:perso/Immae/Sites/Blog" |
20 | HISTORY_GIT_URL = "gitolite@git.immae.eu:perso/Immae/Sites/History" | ||
20 | RECETTES_GIT_URL = "gitolite@git.immae.eu:perso/Immae/Sites/Recettes" | 21 | RECETTES_GIT_URL = "gitolite@git.immae.eu:perso/Immae/Sites/Recettes" |
21 | COURS_GIT_URL = "gitolite@git.immae.eu:perso/Immae/Sites/Cours" | 22 | COURS_GIT_URL = "gitolite@git.immae.eu:perso/Immae/Sites/Cours" |
22 | NORMALESUP_GIT_URL = "gitolite@git.immae.eu:perso/Immae/Projets/Sites/Normalesup" | 23 | NORMALESUP_GIT_URL = "gitolite@git.immae.eu:perso/Immae/Projets/Sites/Normalesup" |
@@ -25,6 +26,7 @@ class E(): | |||
25 | COURS_TARBALL_PATH = "/var/lib/ftp/release.immae.eu/cours" | 26 | COURS_TARBALL_PATH = "/var/lib/ftp/release.immae.eu/cours" |
26 | COURS_TARBALL_URL = "https://release.immae.eu/cours" | 27 | COURS_TARBALL_URL = "https://release.immae.eu/cours" |
27 | BIP39_RELEASE_PATH = "/var/lib/buildbot/outputs/bip39" | 28 | BIP39_RELEASE_PATH = "/var/lib/buildbot/outputs/bip39" |
29 | HISTORY_RELEASE_PATH = "/var/lib/buildbot/outputs/immae/history" | ||
28 | IMMAE_EU_RELEASE_PATH = "/var/lib/buildbot/outputs/immaeEu" | 30 | IMMAE_EU_RELEASE_PATH = "/var/lib/buildbot/outputs/immaeEu" |
29 | RECETTES_RELEASE_PATH = "/var/lib/buildbot/outputs/recettes" | 31 | RECETTES_RELEASE_PATH = "/var/lib/buildbot/outputs/recettes" |
30 | NORMALESUP_RELEASE_PATH = "/var/lib/buildbot/outputs/recherche" | 32 | NORMALESUP_RELEASE_PATH = "/var/lib/buildbot/outputs/recherche" |
@@ -68,12 +70,13 @@ def configure(c): | |||
68 | c['schedulers'].append(hook_scheduler("Normalesup", timer=1)) | 70 | c['schedulers'].append(hook_scheduler("Normalesup", timer=1)) |
69 | c['schedulers'].append(hook_scheduler("Cours", timer=1)) | 71 | c['schedulers'].append(hook_scheduler("Cours", timer=1)) |
70 | c['schedulers'].append(hook_scheduler("Recettes", timer=1)) | 72 | c['schedulers'].append(hook_scheduler("Recettes", timer=1)) |
73 | c['schedulers'].append(hook_scheduler("History", timer=1)) | ||
71 | c['schedulers'].append(hook_scheduler("BIP39", timer=1)) | 74 | c['schedulers'].append(hook_scheduler("BIP39", timer=1)) |
72 | c['schedulers'].append(schedulers.Nightly(name="GSMCells-weekly", | 75 | c['schedulers'].append(schedulers.Nightly(name="GSMCells-weekly", |
73 | builderNames=["GSMCells_build"], dayOfWeek=6, hour=3)) | 76 | builderNames=["GSMCells_build"], dayOfWeek=6, hour=3)) |
74 | c['schedulers'].append(force_scheduler("force_immae_eu", [ | 77 | c['schedulers'].append(force_scheduler("force_immae_eu", [ |
75 | "ImmaeEu_build", "Normalesup_build", "Cours_build", | 78 | "ImmaeEu_build", "Normalesup_build", "Cours_build", |
76 | "Recettes_build", "BIP39_build" | 79 | "Recettes_build", "History_build", "BIP39_build" |
77 | ])) | 80 | ])) |
78 | c['schedulers'].append(schedulers.ForceScheduler( | 81 | c['schedulers'].append(schedulers.ForceScheduler( |
79 | name="GSMCells-force", label="Force build", | 82 | name="GSMCells-force", label="Force build", |
@@ -96,24 +99,46 @@ def configure(c): | |||
96 | c['builders'].append(cours_factory()) | 99 | c['builders'].append(cours_factory()) |
97 | c['builders'].append(gsm_cells_factory()) | 100 | c['builders'].append(gsm_cells_factory()) |
98 | c['builders'].append(recettes_factory()) | 101 | c['builders'].append(recettes_factory()) |
102 | c['builders'].append(history_factory()) | ||
99 | c['builders'].append(bip39_factory()) | 103 | c['builders'].append(bip39_factory()) |
100 | 104 | ||
101 | c['services'].append(SlackStatusPush( | 105 | c['services'].append(SlackStatusPush( |
102 | name="slack_status_immae_eu_project", | 106 | name="slack_status_immae_eu_project", |
103 | builders=[ | 107 | builders=[ |
104 | "ImmaeEu_build", "Normalesup_build", "Cours_build", | 108 | "ImmaeEu_build", "Normalesup_build", "Cours_build", |
105 | "GSMCells_build", "Recettes_build", "BIP39_build" | 109 | "GSMCells_build", "Recettes_build", "History_build", |
110 | "BIP39_build" | ||
106 | ], | 111 | ], |
107 | serverUrl=open(E.SECRETS_FILE + "/slack_webhook", "r").read().rstrip())) | 112 | serverUrl=open(E.SECRETS_FILE + "/slack_webhook", "r").read().rstrip())) |
108 | c['services'].append(XMPPStatusPush( | 113 | c['services'].append(XMPPStatusPush( |
109 | name="xmpp_status_immae_eu_project", | 114 | name="xmpp_status_immae_eu_project", |
110 | builders=[ | 115 | builders=[ |
111 | "ImmaeEu_build", "Normalesup_build", "Cours_build", | 116 | "ImmaeEu_build", "Normalesup_build", "Cours_build", |
112 | "GSMCells_build", "Recettes_build", "BIP39_build" | 117 | "GSMCells_build", "Recettes_build", "History_build", |
118 | "BIP39_build" | ||
113 | ], | 119 | ], |
114 | recipients=E.XMPP_RECIPIENTS, | 120 | recipients=E.XMPP_RECIPIENTS, |
115 | password=open(E.SECRETS_FILE + "/notify_xmpp_password", "r").read().rstrip())) | 121 | password=open(E.SECRETS_FILE + "/notify_xmpp_password", "r").read().rstrip())) |
116 | 122 | ||
123 | def history_factory(): | ||
124 | path_env = { | ||
125 | "PATH": os.environ["BUILDBOT_PATH_History"] + ":${PATH}" | ||
126 | } | ||
127 | factory = util.BuildFactory() | ||
128 | factory.addStep(steps.Git(logEnviron=False, repourl=E.HISTORY_GIT_URL, | ||
129 | submodules=True, sshPrivateKey=open(E.SSH_KEY_PATH).read().rstrip(), | ||
130 | sshHostKey=E.SSH_HOST_KEY, mode="full", method="copy")) | ||
131 | factory.addStep(steps.ShellCommand(name="build website", | ||
132 | logEnviron=False, haltOnFailure=True, workdir="source", | ||
133 | env=path_env, command=["jekyll", "build"])) | ||
134 | factory.addStep(steps.MasterShellCommand(command="rm -rf {}".format(E.HISTORY_RELEASE_PATH))) | ||
135 | factory.addStep(steps.DirectoryUpload(workersrc="../source/_site", | ||
136 | masterdest=E.HISTORY_RELEASE_PATH, | ||
137 | url="https://www.immae.eu/history")) | ||
138 | factory.addStep(steps.MasterShellCommand(command="chmod -R a+rX {}".format(E.HISTORY_RELEASE_PATH))) | ||
139 | |||
140 | return util.BuilderConfig(name="History_build", workernames=["generic-worker-immae-eu"], factory=factory) | ||
141 | |||
117 | def recettes_factory(): | 142 | def recettes_factory(): |
118 | path_env = { | 143 | path_env = { |
119 | "PATH": os.environ["BUILDBOT_PATH_Recettes"] + ":${PATH}" | 144 | "PATH": os.environ["BUILDBOT_PATH_Recettes"] + ":${PATH}" |
diff --git a/modules/private/websites/immae/history/.gitignore b/modules/private/websites/immae/history/.gitignore deleted file mode 100644 index 64af247..0000000 --- a/modules/private/websites/immae/history/.gitignore +++ /dev/null | |||
@@ -1,3 +0,0 @@ | |||
1 | _site | ||
2 | .sass-cache | ||
3 | .jekyll-metadata \ No newline at end of file | ||
diff --git a/modules/private/websites/immae/history/Gemfile b/modules/private/websites/immae/history/Gemfile deleted file mode 100644 index 35f655f..0000000 --- a/modules/private/websites/immae/history/Gemfile +++ /dev/null | |||
@@ -1,31 +0,0 @@ | |||
1 | source "https://rubygems.org" | ||
2 | |||
3 | # Hello! This is where you manage which Jekyll version is used to run. | ||
4 | # When you want to use a different version, change it below, save the | ||
5 | # file and run `bundle install`. Run Jekyll with `bundle exec`, like so: | ||
6 | # | ||
7 | # bundle exec jekyll serve | ||
8 | # | ||
9 | # This will help ensure the proper Jekyll version is running. | ||
10 | # Happy Jekylling! | ||
11 | gem "jekyll", "~> 3.8.5" | ||
12 | |||
13 | # This is the default theme for new Jekyll sites. You may change this to anything you like. | ||
14 | gem "minima", "~> 2.0" | ||
15 | |||
16 | # If you want to use GitHub Pages, remove the "gem "jekyll"" above and | ||
17 | # uncomment the line below. To upgrade, run `bundle update github-pages`. | ||
18 | # gem "github-pages", group: :jekyll_plugins | ||
19 | |||
20 | # If you have any plugins, put them here! | ||
21 | group :jekyll_plugins do | ||
22 | gem "jekyll-feed", "~> 0.6" | ||
23 | gem 'jekyll-paginate-v2', '1.9.0' | ||
24 | end | ||
25 | |||
26 | # Windows does not include zoneinfo files, so bundle the tzinfo-data gem | ||
27 | gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby] | ||
28 | |||
29 | # Performance-booster for watching directories on Windows | ||
30 | gem "wdm", "~> 0.1.0" if Gem.win_platform? | ||
31 | |||
diff --git a/modules/private/websites/immae/history/Gemfile.lock b/modules/private/websites/immae/history/Gemfile.lock deleted file mode 100644 index 9a3cb5e..0000000 --- a/modules/private/websites/immae/history/Gemfile.lock +++ /dev/null | |||
@@ -1,75 +0,0 @@ | |||
1 | GEM | ||
2 | remote: https://rubygems.org/ | ||
3 | specs: | ||
4 | addressable (2.7.0) | ||
5 | public_suffix (>= 2.0.2, < 5.0) | ||
6 | colorator (1.1.0) | ||
7 | concurrent-ruby (1.1.6) | ||
8 | em-websocket (0.5.1) | ||
9 | eventmachine (>= 0.12.9) | ||
10 | http_parser.rb (~> 0.6.0) | ||
11 | eventmachine (1.2.7) | ||
12 | ffi (1.13.0) | ||
13 | forwardable-extended (2.6.0) | ||
14 | http_parser.rb (0.6.0) | ||
15 | i18n (0.9.5) | ||
16 | concurrent-ruby (~> 1.0) | ||
17 | jekyll (3.8.7) | ||
18 | addressable (~> 2.4) | ||
19 | colorator (~> 1.0) | ||
20 | em-websocket (~> 0.5) | ||
21 | i18n (~> 0.7) | ||
22 | jekyll-sass-converter (~> 1.0) | ||
23 | jekyll-watch (~> 2.0) | ||
24 | kramdown (~> 1.14) | ||
25 | liquid (~> 4.0) | ||
26 | mercenary (~> 0.3.3) | ||
27 | pathutil (~> 0.9) | ||
28 | rouge (>= 1.7, < 4) | ||
29 | safe_yaml (~> 1.0) | ||
30 | jekyll-feed (0.13.0) | ||
31 | jekyll (>= 3.7, < 5.0) | ||
32 | jekyll-paginate-v2 (1.9.0) | ||
33 | jekyll (~> 3.0) | ||
34 | jekyll-sass-converter (1.5.2) | ||
35 | sass (~> 3.4) | ||
36 | jekyll-seo-tag (2.6.1) | ||
37 | jekyll (>= 3.3, < 5.0) | ||
38 | jekyll-watch (2.2.1) | ||
39 | listen (~> 3.0) | ||
40 | kramdown (1.17.0) | ||
41 | liquid (4.0.3) | ||
42 | listen (3.2.1) | ||
43 | rb-fsevent (~> 0.10, >= 0.10.3) | ||
44 | rb-inotify (~> 0.9, >= 0.9.10) | ||
45 | mercenary (0.3.6) | ||
46 | minima (2.5.1) | ||
47 | jekyll (>= 3.5, < 5.0) | ||
48 | jekyll-feed (~> 0.9) | ||
49 | jekyll-seo-tag (~> 2.1) | ||
50 | pathutil (0.16.2) | ||
51 | forwardable-extended (~> 2.6) | ||
52 | public_suffix (4.0.5) | ||
53 | rb-fsevent (0.10.4) | ||
54 | rb-inotify (0.10.1) | ||
55 | ffi (~> 1.0) | ||
56 | rouge (3.19.0) | ||
57 | safe_yaml (1.0.5) | ||
58 | sass (3.7.4) | ||
59 | sass-listen (~> 4.0.0) | ||
60 | sass-listen (4.0.0) | ||
61 | rb-fsevent (~> 0.9, >= 0.9.4) | ||
62 | rb-inotify (~> 0.9, >= 0.9.7) | ||
63 | |||
64 | PLATFORMS | ||
65 | ruby | ||
66 | |||
67 | DEPENDENCIES | ||
68 | jekyll (~> 3.8.5) | ||
69 | jekyll-feed (~> 0.6) | ||
70 | jekyll-paginate-v2 (= 1.9.0) | ||
71 | minima (~> 2.0) | ||
72 | tzinfo-data | ||
73 | |||
74 | BUNDLED WITH | ||
75 | 2.1.4 | ||
diff --git a/modules/private/websites/immae/history/LICENSE b/modules/private/websites/immae/history/LICENSE deleted file mode 100644 index 0e87543..0000000 --- a/modules/private/websites/immae/history/LICENSE +++ /dev/null | |||
@@ -1,9 +0,0 @@ | |||
1 | MIT License | ||
2 | |||
3 | Copyright (c) 2019 bansal.io | ||
4 | |||
5 | Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: | ||
6 | |||
7 | The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. | ||
8 | |||
9 | THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file | ||
diff --git a/modules/private/websites/immae/history/_config.yml b/modules/private/websites/immae/history/_config.yml deleted file mode 100644 index 56da0e4..0000000 --- a/modules/private/websites/immae/history/_config.yml +++ /dev/null | |||
@@ -1,47 +0,0 @@ | |||
1 | title: Historique d’ImmaeEu | ||
2 | heading: Mises à jour | ||
3 | logo: /logo.jpg | ||
4 | website: https://www.immae.eu | ||
5 | |||
6 | # the base hostname & protocol for your site, | ||
7 | # e.g. https://updates.changelog.site | ||
8 | # Note Don't put trailing slash https://updates.changelog.site/ | ||
9 | url: "https://www.immae.eu" # (required) | ||
10 | |||
11 | baseurl: '/history' # optional | ||
12 | |||
13 | rss-feed-icon: true #(optional) | ||
14 | |||
15 | defaults: | ||
16 | - | ||
17 | scope: | ||
18 | path: "_posts" | ||
19 | type: "posts" | ||
20 | values: | ||
21 | layout: "post" | ||
22 | - | ||
23 | scope: | ||
24 | path: "assets" | ||
25 | values: | ||
26 | sitemap: false | ||
27 | |||
28 | permalink: /:title/ | ||
29 | markdown: kramdown | ||
30 | highlighter: rouge | ||
31 | sass: | ||
32 | sass_dir: _sass | ||
33 | style: compressed | ||
34 | |||
35 | exclude: [ "Gemfile", "Gemfile.lock", "gemset.nix", "LICENSE", "default.nix", "shell.nix", "readme.md" ] | ||
36 | |||
37 | plugins: | ||
38 | - jekyll-feed | ||
39 | - jekyll-paginate-v2 | ||
40 | |||
41 | pagination: | ||
42 | enabled: true | ||
43 | per_page: 20 | ||
44 | title: ':title - page :num of :max' | ||
45 | limit: 0 | ||
46 | sort_field: 'date' | ||
47 | sort_reverse: true | ||
diff --git a/modules/private/websites/immae/history/_data/categories.yml b/modules/private/websites/immae/history/_data/categories.yml deleted file mode 100644 index 5c8637f..0000000 --- a/modules/private/websites/immae/history/_data/categories.yml +++ /dev/null | |||
@@ -1,19 +0,0 @@ | |||
1 | # Available colors: blue, red, orange, green, purple | ||
2 | - name: Nouveautés | ||
3 | color: green | ||
4 | |||
5 | - name: Mises à jour | ||
6 | color: green | ||
7 | |||
8 | - name: Pannes | ||
9 | color: red | ||
10 | |||
11 | - name: Fix | ||
12 | color: orange | ||
13 | |||
14 | - name: Informations | ||
15 | color: blue | ||
16 | |||
17 | - name: Maintenance | ||
18 | color: purple | ||
19 | |||
diff --git a/modules/private/websites/immae/history/_includes/footer.html b/modules/private/websites/immae/history/_includes/footer.html deleted file mode 100644 index a6adafb..0000000 --- a/modules/private/websites/immae/history/_includes/footer.html +++ /dev/null | |||
@@ -1,5 +0,0 @@ | |||
1 | <footer class="p-3 text-center mt-5"> | ||
2 | <div class="w-25 border-top mb-3 mx-auto"></div> | ||
3 | <a href="https://changelog.site">Powered By ChangeLog.Site</a> | ||
4 | </footer> | ||
5 | {% include scripts.html %} \ No newline at end of file | ||
diff --git a/modules/private/websites/immae/history/_includes/head.html b/modules/private/websites/immae/history/_includes/head.html deleted file mode 100644 index cd9112e..0000000 --- a/modules/private/websites/immae/history/_includes/head.html +++ /dev/null | |||
@@ -1,18 +0,0 @@ | |||
1 | <head> | ||
2 | <meta charset="utf-8"> | ||
3 | <meta name="viewport" content="width=device-width, initial-scale=1"> | ||
4 | <title>{% if page.title %}{{ page.title }}{% else %}{{ site.name }}{% endif %}</title> | ||
5 | <link rel="icon" type="image/png" href="/favicon.png"> | ||
6 | <!-- CSS --> | ||
7 | <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous"> | ||
8 | <link rel="stylesheet" href="{{ site.baseurl }}/assets/css/main.css" type="text/css"> | ||
9 | |||
10 | <!-- Font --> | ||
11 | <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Source+Sans+Pro"> | ||
12 | |||
13 | <link rel="canonical" href="{{ page.url | replace:'index.html','' | absolute_url }}"> | ||
14 | <link rel="alternate" type="application/rss+xml" title="{{ site.title | escape }}" href="{{ "/feed.xml" | relative_url }}"> | ||
15 | |||
16 | </head> | ||
17 | |||
18 | \ No newline at end of file | ||
diff --git a/modules/private/websites/immae/history/_includes/header.html b/modules/private/websites/immae/history/_includes/header.html deleted file mode 100644 index 09a5eb3..0000000 --- a/modules/private/websites/immae/history/_includes/header.html +++ /dev/null | |||
@@ -1,36 +0,0 @@ | |||
1 | <nav class="bg-light border-bottom px-5 py-3"> | ||
2 | |||
3 | <div class="w-75 mx-auto"> | ||
4 | |||
5 | <div class="row"> | ||
6 | <div class="col-md-6"> | ||
7 | <div class="d-flex align-items-center"> | ||
8 | <a href="{{ site.website }}"> | ||
9 | <img src="{{ site.logo }}" alt="{{ site.name }}" class="logo" alt="Logo"> | ||
10 | </a> | ||
11 | <a href="{{ site.url }}{{ site.baseurl }}"> | ||
12 | <span class="text-muted mx-3"> | ||
13 | Historique | ||
14 | </span> | ||
15 | </a> | ||
16 | </div> | ||
17 | </div> | ||
18 | |||
19 | <div class="col-md-6 ml-auto d-flex align-items-center justify-content-end"> | ||
20 | {% if site.rss-feed-icon %} | ||
21 | <a href="{{ site.baseurl }}/feed.xml" | ||
22 | class="inline-block mt-3 mt-md-0 text-orange d-flex align-items-center"> | ||
23 | <svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 22 22" fill="none" | ||
24 | stroke="currentColor" stroke-width="3" stroke-linecap="round" stroke-linejoin="round" | ||
25 | class="feather feather-rss"> | ||
26 | <path d="M4 11a9 9 0 0 1 9 9"></path> | ||
27 | <path d="M4 4a16 16 0 0 1 16 16"></path> | ||
28 | <circle cx="5" cy="19" r="1"></circle> | ||
29 | </svg> | ||
30 | </a> | ||
31 | {% endif %} | ||
32 | </div> | ||
33 | </div> | ||
34 | |||
35 | </div> | ||
36 | </nav> | ||
diff --git a/modules/private/websites/immae/history/_includes/post.html b/modules/private/websites/immae/history/_includes/post.html deleted file mode 100644 index c6177ab..0000000 --- a/modules/private/websites/immae/history/_includes/post.html +++ /dev/null | |||
@@ -1,29 +0,0 @@ | |||
1 | <div class="row p-3"> | ||
2 | <div class="col-md-3 mb-3"> | ||
3 | <a href="{{ include.url | prepend: site.baseurl | replace: '//', '/' }}" class="post-date text-muted"> | ||
4 | {{ include.date | date: '%F' }} | ||
5 | </a> | ||
6 | </div> | ||
7 | <div class="col-md-9"> | ||
8 | <h2 class="title"> | ||
9 | {{ include.title }} | ||
10 | </h2> | ||
11 | <div> | ||
12 | {% if include.category %} | ||
13 | |||
14 | {% for category in site.data.categories %} | ||
15 | {% if category.name == include.category %} | ||
16 | {% assign color = category.color | downcase | prepend: 'bg-' %} | ||
17 | {% endif %} | ||
18 | {% endfor %} | ||
19 | <span class="category {% if color %}{{ color }}{% endif %}">{{ include.category }}</span> | ||
20 | {% for tag in include.tags %} | ||
21 | <span class="category">{{ tag }}</span> | ||
22 | {% endfor %} | ||
23 | {% endif %} | ||
24 | </div> | ||
25 | <div class="post-content my-4 text-grey-darker leading-normal text-base font-thin"> | ||
26 | {{ include.content }} | ||
27 | </div> | ||
28 | </div> | ||
29 | </div> | ||
diff --git a/modules/private/websites/immae/history/_includes/scripts.html b/modules/private/websites/immae/history/_includes/scripts.html deleted file mode 100644 index 7597aa7..0000000 --- a/modules/private/websites/immae/history/_includes/scripts.html +++ /dev/null | |||
@@ -1,4 +0,0 @@ | |||
1 | <script src="//cdnjs.cloudflare.com/ajax/libs/jquery/3.4.1/jquery.min.js"></script> | ||
2 | <script src="//unpkg.com/jscroll/dist/jquery.jscroll.min.js"></script> | ||
3 | <script src="{{ site.baseurl }}/assets/js/script.js"></script> | ||
4 | <script defer src="//commento.immae.eu/js/commento.js"></script> | ||
diff --git a/modules/private/websites/immae/history/_layouts/default.html b/modules/private/websites/immae/history/_layouts/default.html deleted file mode 100644 index 24c76ed..0000000 --- a/modules/private/websites/immae/history/_layouts/default.html +++ /dev/null | |||
@@ -1,47 +0,0 @@ | |||
1 | <!DOCTYPE html> | ||
2 | <html> | ||
3 | {% include head.html %} | ||
4 | |||
5 | <body> | ||
6 | |||
7 | <div id="fb-root"></div> | ||
8 | |||
9 | {% include header.html %} | ||
10 | <div class="p-4"> | ||
11 | <div class="row no-gutters"> | ||
12 | <div class="col-md-7 offset-md-2"> | ||
13 | {% if page.name == 'index.html' %} | ||
14 | <div class="d-flex"> | ||
15 | <a href="javascript:void(0);" id="expand-list" class="text-muted ml-auto"><svg | ||
16 | xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 24 24" fill="none" | ||
17 | stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" | ||
18 | class="feather feather-list"> | ||
19 | <line x1="8" y1="6" x2="21" y2="6"></line> | ||
20 | <line x1="8" y1="12" x2="21" y2="12"></line> | ||
21 | <line x1="8" y1="18" x2="21" y2="18"></line> | ||
22 | <line x1="3" y1="6" x2="3" y2="6"></line> | ||
23 | <line x1="3" y1="12" x2="3" y2="12"></line> | ||
24 | <line x1="3" y1="18" x2="3" y2="18"></line> | ||
25 | </svg></a> | ||
26 | <a href="javascript:void(0);" id="collapse-list" class="text-muted ml-3"><svg | ||
27 | xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 24 24" fill="none" | ||
28 | stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" | ||
29 | class="feather feather-server"> | ||
30 | <rect x="2" y="2" width="20" height="8" rx="2" ry="2"></rect> | ||
31 | <rect x="2" y="14" width="20" height="8" rx="2" ry="2"></rect> | ||
32 | <line x1="6" y1="6" x2="6" y2="6"></line> | ||
33 | <line x1="6" y1="18" x2="6" y2="18"></line> | ||
34 | </svg></a> | ||
35 | </div> | ||
36 | {% endif %} | ||
37 | <div class=" pt-5"> | ||
38 | {{ content }} | ||
39 | </div> | ||
40 | </div> | ||
41 | </div> | ||
42 | </div> | ||
43 | |||
44 | {% include footer.html %} | ||
45 | </body> | ||
46 | |||
47 | </html> \ No newline at end of file | ||
diff --git a/modules/private/websites/immae/history/_layouts/post.html b/modules/private/websites/immae/history/_layouts/post.html deleted file mode 100644 index d2e3350..0000000 --- a/modules/private/websites/immae/history/_layouts/post.html +++ /dev/null | |||
@@ -1,8 +0,0 @@ | |||
1 | --- | ||
2 | layout: default | ||
3 | --- | ||
4 | {% include post.html title=page.title category=page.category tags=page.tags url=page.url date=page.date content=content %} | ||
5 | |||
6 | <hr> | ||
7 | |||
8 | <div id="commento"></div> | ||
diff --git a/modules/private/websites/immae/history/_posts/2020-05-28-fix-xmpp.md b/modules/private/websites/immae/history/_posts/2020-05-28-fix-xmpp.md deleted file mode 100644 index 72422e4..0000000 --- a/modules/private/websites/immae/history/_posts/2020-05-28-fix-xmpp.md +++ /dev/null | |||
@@ -1,10 +0,0 @@ | |||
1 | --- | ||
2 | title: "Modification du certificat SSL d’XMPP" | ||
3 | category: Fix | ||
4 | tags: [XMPP] | ||
5 | date: 2020-05-28 | ||
6 | --- | ||
7 | Suite à la migration d’acme, le certificate d’XMPP utilisait une clé de | ||
8 | type Elliptic Curve pour ses certificats, ce qui posait problème aux | ||
9 | anciennes version d’openssl. La clé a été changée pour du RSA4096 pour | ||
10 | permettre une compatibilité avec ces versions. | ||
diff --git a/modules/private/websites/immae/history/_posts/2020-05-31-fix-postfix-headers.md b/modules/private/websites/immae/history/_posts/2020-05-31-fix-postfix-headers.md deleted file mode 100644 index fc30af2..0000000 --- a/modules/private/websites/immae/history/_posts/2020-05-31-fix-postfix-headers.md +++ /dev/null | |||
@@ -1,8 +0,0 @@ | |||
1 | --- | ||
2 | title: "Ajout d’un header dans les mails traités par postfix" | ||
3 | category: Fix | ||
4 | tags: [Mail] | ||
5 | date: 2020-05-31 | ||
6 | --- | ||
7 | Un header X-Original-To a été ajouté aux en-têtes des e-mails reçus par | ||
8 | postfix pour indiquer la cible réelle du mail. | ||
diff --git a/modules/private/websites/immae/history/_posts/2020-06-06-new-moteur-de-commentaires.md b/modules/private/websites/immae/history/_posts/2020-06-06-new-moteur-de-commentaires.md deleted file mode 100644 index 7371d1a..0000000 --- a/modules/private/websites/immae/history/_posts/2020-06-06-new-moteur-de-commentaires.md +++ /dev/null | |||
@@ -1,10 +0,0 @@ | |||
1 | --- | ||
2 | title: "Moteur de commentaires" | ||
3 | category: Nouveautés | ||
4 | tags: [Général] | ||
5 | date: 2020-06-06 | ||
6 | --- | ||
7 | Un [nouveau moteur de commentaires](https://commento.immae.eu) a été | ||
8 | installé, pour obtenir une fonctionnalité similaire à des outils tels | ||
9 | que disqus. Il est pour l’instant uilisé pour le | ||
10 | [blog](https://www.immae.eu/blog) et le [livre de recettes](https://www.immae.eu/recettes) | ||
diff --git a/modules/private/websites/immae/history/_posts/2020-06-07-new-historique.md b/modules/private/websites/immae/history/_posts/2020-06-07-new-historique.md deleted file mode 100644 index ff3eb6a..0000000 --- a/modules/private/websites/immae/history/_posts/2020-06-07-new-historique.md +++ /dev/null | |||
@@ -1,9 +0,0 @@ | |||
1 | --- | ||
2 | title: "Nouvelle page d’historique" | ||
3 | category: Nouveautés | ||
4 | tags: [Général] | ||
5 | date: 2020-06-07 | ||
6 | --- | ||
7 | ImmaeEu intègre dorénavant une page d’historique, pour lister l’ensemble | ||
8 | des changements importants de l’infrastructure : pannes, nouveautés, | ||
9 | maintenance, etc. | ||
diff --git a/modules/private/websites/immae/history/_posts/2020-06-13-fix-adminer.md b/modules/private/websites/immae/history/_posts/2020-06-13-fix-adminer.md deleted file mode 100644 index af6edf1..0000000 --- a/modules/private/websites/immae/history/_posts/2020-06-13-fix-adminer.md +++ /dev/null | |||
@@ -1,10 +0,0 @@ | |||
1 | --- | ||
2 | title: "Réparation d’Adminer" | ||
3 | category: Fix | ||
4 | tags: [BDD] | ||
5 | date: 2020-06-13 | ||
6 | --- | ||
7 | Depuis la mise à jour de NixOS à 19.09, Adminer (et plus généralement | ||
8 | php) n’était plus capable de se connecter à mysql avec le mécanisme PAM. | ||
9 | L’extension mysqli a été patchée pour permettre une telle utilisation, | ||
10 | permettant d’utiliser à nouveau Adminer comme client. | ||
diff --git a/modules/private/websites/immae/history/_posts/2020-06-13-maj-wallabag.md b/modules/private/websites/immae/history/_posts/2020-06-13-maj-wallabag.md deleted file mode 100644 index da95010..0000000 --- a/modules/private/websites/immae/history/_posts/2020-06-13-maj-wallabag.md +++ /dev/null | |||
@@ -1,10 +0,0 @@ | |||
1 | --- | ||
2 | title: "Mise à jour de Wallabag à 2.3.8" | ||
3 | category: Mises à jour | ||
4 | tags: [Wallabag] | ||
5 | date: 2020-06-13 | ||
6 | --- | ||
7 | Wallabag n’était plus en mesure d’ajouter de nouveaux articles depuis | ||
8 | une mise à jour (de php probablement : cf [cette issue sur | ||
9 | github](https://github.com/wallabag/wallabag/issues/3926)). La dernière | ||
10 | version de Wallabag corrige ce problème. | ||
diff --git a/modules/private/websites/immae/history/_sass/style.scss b/modules/private/websites/immae/history/_sass/style.scss deleted file mode 100644 index cb2702a..0000000 --- a/modules/private/websites/immae/history/_sass/style.scss +++ /dev/null | |||
@@ -1,127 +0,0 @@ | |||
1 | body { | ||
2 | font-family: $primary-font; | ||
3 | font-size: 16px; | ||
4 | line-height: 1.8; | ||
5 | min-height: 100vh; | ||
6 | color: $text-color-primary; | ||
7 | } | ||
8 | |||
9 | .logo { | ||
10 | max-height: 45px; | ||
11 | } | ||
12 | |||
13 | footer a { | ||
14 | color: rgba(0, 0, 0, 0.4); | ||
15 | font-size: 0.8rem; | ||
16 | } | ||
17 | |||
18 | .category { | ||
19 | padding: 3px 10px; | ||
20 | background: $primary-color; | ||
21 | color: rgba(255, 255, 255, 0.9); | ||
22 | border-radius: 20px; | ||
23 | font-size: 12px; | ||
24 | line-height: 1.2; | ||
25 | } | ||
26 | |||
27 | @each $color, | ||
28 | $value in $tag-colors { | ||
29 | .text-#{$color} { | ||
30 | color: $value; | ||
31 | } | ||
32 | |||
33 | .bg-#{$color} { | ||
34 | background-color: $value; | ||
35 | } | ||
36 | } | ||
37 | |||
38 | .title { | ||
39 | color: rgba(0, 0, 0, 0.9); | ||
40 | font-weight: 600; | ||
41 | font-size: 1.8rem; | ||
42 | } | ||
43 | |||
44 | .post-content { | ||
45 | |||
46 | |||
47 | h1, | ||
48 | h2, | ||
49 | h3, | ||
50 | h4, | ||
51 | h5, | ||
52 | h6 { | ||
53 | margin-top: 1.5rem; | ||
54 | margin-bottom: 0.8rem; | ||
55 | } | ||
56 | |||
57 | strong{ | ||
58 | color: darken($text-color-primary, 50%); | ||
59 | font-weight: 600; | ||
60 | } | ||
61 | |||
62 | table { | ||
63 | border: 1px solid $border-color; | ||
64 | width: 100%; | ||
65 | margin-bottom: 1rem; | ||
66 | border-collapse: collapse; | ||
67 | |||
68 | th, | ||
69 | td { | ||
70 | border: 1px solid $border-color; | ||
71 | padding: .75rem; | ||
72 | vertical-align: top; | ||
73 | border-top: 1px solid $border-color; | ||
74 | } | ||
75 | |||
76 | thead { | ||
77 | |||
78 | th, | ||
79 | td { | ||
80 | border-bottom-width: 2px; | ||
81 | padding: .75rem; | ||
82 | vertical-align: top; | ||
83 | border-top: 1px solid $border-color; | ||
84 | } | ||
85 | } | ||
86 | } | ||
87 | |||
88 | // Blockquote | ||
89 | |||
90 | blockquote { | ||
91 | background: $bg-light; | ||
92 | font-style: italic; | ||
93 | border-left: 8px solid $border-color; | ||
94 | padding: 20px; | ||
95 | margin: 20px 0px; | ||
96 | box-sizing: border-box; | ||
97 | } | ||
98 | |||
99 | a { | ||
100 | color: $primary-color; | ||
101 | &:hover { | ||
102 | color: darken($primary-color, 15%); | ||
103 | } | ||
104 | } | ||
105 | |||
106 | |||
107 | |||
108 | p code, | ||
109 | li code { | ||
110 | font-size: .8rem; | ||
111 | line-height: 1.8571; | ||
112 | color: rgba(0, 0, 0, 1); | ||
113 | background-color: $bg-light; | ||
114 | border: 1px solid $border-color; | ||
115 | -webkit-border-radius: 4px; | ||
116 | -moz-border-radius: 4px; | ||
117 | border-radius: 4px; | ||
118 | margin: 0 2px; | ||
119 | padding: 0 5px; | ||
120 | } | ||
121 | |||
122 | img { | ||
123 | max-width: 100%; | ||
124 | height: auto; | ||
125 | margin: 10px 0px; | ||
126 | } | ||
127 | } \ No newline at end of file | ||
diff --git a/modules/private/websites/immae/history/_sass/syntex.scss b/modules/private/websites/immae/history/_sass/syntex.scss deleted file mode 100644 index d09a98f..0000000 --- a/modules/private/websites/immae/history/_sass/syntex.scss +++ /dev/null | |||
@@ -1,38 +0,0 @@ | |||
1 | .highlight .hll { background-color: #ffffcc } | ||
2 | .highlight { background: #f8f8f8; padding: 0.5em 1em; border-radius: 4px; margin-bottom: 0em;} | ||
3 | .highlight .c { color: #008000 } /* Comment */ | ||
4 | .highlight .err { border: 1px solid #FF0000 } /* Error */ | ||
5 | .highlight .k { color: #0000ff } /* Keyword */ | ||
6 | .highlight .ch { color: #008000 } /* Comment.Hashbang */ | ||
7 | .highlight .cm { color: #008000 } /* Comment.Multiline */ | ||
8 | .highlight .cp { color: #0000ff } /* Comment.Preproc */ | ||
9 | .highlight .cpf { color: #008000 } /* Comment.PreprocFile */ | ||
10 | .highlight .c1 { color: #008000 } /* Comment.Single */ | ||
11 | .highlight .cs { color: #008000 } /* Comment.Special */ | ||
12 | .highlight .ge { font-style: italic } /* Generic.Emph */ | ||
13 | .highlight .gh { font-weight: bold } /* Generic.Heading */ | ||
14 | .highlight .gp { font-weight: bold } /* Generic.Prompt */ | ||
15 | .highlight .gs { font-weight: bold } /* Generic.Strong */ | ||
16 | .highlight .gu { font-weight: bold } /* Generic.Subheading */ | ||
17 | .highlight .kc { color: #0000ff } /* Keyword.Constant */ | ||
18 | .highlight .kd { color: #0000ff } /* Keyword.Declaration */ | ||
19 | .highlight .kn { color: #0000ff } /* Keyword.Namespace */ | ||
20 | .highlight .kp { color: #0000ff } /* Keyword.Pseudo */ | ||
21 | .highlight .kr { color: #0000ff } /* Keyword.Reserved */ | ||
22 | .highlight .kt { color: #2b91af } /* Keyword.Type */ | ||
23 | .highlight .s { color: #a31515 } /* Literal.String */ | ||
24 | .highlight .nc { color: #2b91af } /* Name.Class */ | ||
25 | .highlight .ow { color: #0000ff } /* Operator.Word */ | ||
26 | .highlight .sa { color: #a31515 } /* Literal.String.Affix */ | ||
27 | .highlight .sb { color: #a31515 } /* Literal.String.Backtick */ | ||
28 | .highlight .sc { color: #a31515 } /* Literal.String.Char */ | ||
29 | .highlight .dl { color: #a31515 } /* Literal.String.Delimiter */ | ||
30 | .highlight .sd { color: #a31515 } /* Literal.String.Doc */ | ||
31 | .highlight .s2 { color: #a31515 } /* Literal.String.Double */ | ||
32 | .highlight .se { color: #a31515 } /* Literal.String.Escape */ | ||
33 | .highlight .sh { color: #a31515 } /* Literal.String.Heredoc */ | ||
34 | .highlight .si { color: #a31515 } /* Literal.String.Interpol */ | ||
35 | .highlight .sx { color: #a31515 } /* Literal.String.Other */ | ||
36 | .highlight .sr { color: #a31515 } /* Literal.String.Regex */ | ||
37 | .highlight .s1 { color: #a31515 } /* Literal.String.Single */ | ||
38 | .highlight .ss { color: #a31515 } /* Literal.String.Symbol */ \ No newline at end of file | ||
diff --git a/modules/private/websites/immae/history/_sass/variables.scss b/modules/private/websites/immae/history/_sass/variables.scss deleted file mode 100644 index 5719431..0000000 --- a/modules/private/websites/immae/history/_sass/variables.scss +++ /dev/null | |||
@@ -1,16 +0,0 @@ | |||
1 | $primary-font: 'Source Sans Pro', sans-serif; | ||
2 | $primary-color: #0775F8; | ||
3 | $text-color-primary: #48586b; | ||
4 | $border-color: #dae1e7; | ||
5 | $bg-light: #f1f5f8; | ||
6 | $blue: #0775F8; | ||
7 | $purple: #6D75F1; | ||
8 | $green: #00CECE; | ||
9 | $red: #F7444E; | ||
10 | $orange: #F27013; | ||
11 | |||
12 | $tag-colors: ("blue": $blue, | ||
13 | "purple": $purple, | ||
14 | "green": $green, | ||
15 | "red": $red, | ||
16 | "orange": $orange); \ No newline at end of file | ||
diff --git a/modules/private/websites/immae/history/assets/css/main.scss b/modules/private/websites/immae/history/assets/css/main.scss deleted file mode 100644 index 7df8776..0000000 --- a/modules/private/websites/immae/history/assets/css/main.scss +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | --- | ||
2 | sitemap: false | ||
3 | --- | ||
4 | @import "variables"; | ||
5 | @import "syntex"; | ||
6 | @import "style"; \ No newline at end of file | ||
diff --git a/modules/private/websites/immae/history/assets/js/script.js b/modules/private/websites/immae/history/assets/js/script.js deleted file mode 100644 index 65115d3..0000000 --- a/modules/private/websites/immae/history/assets/js/script.js +++ /dev/null | |||
@@ -1,17 +0,0 @@ | |||
1 | $(function() { | ||
2 | var options = { | ||
3 | padding: 0, | ||
4 | nextSelector: 'a.next-page:last', | ||
5 | contentSelector: '.post_list', | ||
6 | autoTrigger: false, | ||
7 | debug: true | ||
8 | }; | ||
9 | |||
10 | $('.post_list').jscroll(options); | ||
11 | $(document).on('click', '#expand-list', function(){ | ||
12 | $('.post-content').hide(); | ||
13 | }); | ||
14 | $(document).on('click', '#collapse-list', function(){ | ||
15 | $('.post-content').show(); | ||
16 | }); | ||
17 | }); \ No newline at end of file | ||
diff --git a/modules/private/websites/immae/history/default.nix b/modules/private/websites/immae/history/default.nix deleted file mode 100644 index 2335627..0000000 --- a/modules/private/websites/immae/history/default.nix +++ /dev/null | |||
@@ -1,27 +0,0 @@ | |||
1 | { lib, bundlerEnv, ruby, stdenv }: | ||
2 | |||
3 | # rebuild with bundix -l | ||
4 | let | ||
5 | jekyll = bundlerEnv rec { | ||
6 | name = pname + "-" + version; | ||
7 | pname = "jekyll"; | ||
8 | version = (import ./gemset.nix).jekyll.version; | ||
9 | |||
10 | inherit ruby; | ||
11 | gemdir = ./.; | ||
12 | }; | ||
13 | in | ||
14 | stdenv.mkDerivation rec { | ||
15 | pname = "changelog"; | ||
16 | version = "1"; | ||
17 | src = ./.; | ||
18 | buildInputs = [ jekyll ]; | ||
19 | phases = [ "unpackPhase" "buildPhase" "installPhase"]; | ||
20 | buildPhase = '' | ||
21 | jekyll build | ||
22 | ''; | ||
23 | |||
24 | installPhase = '' | ||
25 | cp -a _site $out | ||
26 | ''; | ||
27 | } | ||
diff --git a/modules/private/websites/immae/history/gemset.nix b/modules/private/websites/immae/history/gemset.nix deleted file mode 100644 index 55bb74a..0000000 --- a/modules/private/websites/immae/history/gemset.nix +++ /dev/null | |||
@@ -1,297 +0,0 @@ | |||
1 | { | ||
2 | addressable = { | ||
3 | dependencies = ["public_suffix"]; | ||
4 | groups = ["default" "jekyll_plugins"]; | ||
5 | platforms = []; | ||
6 | source = { | ||
7 | remotes = ["https://rubygems.org"]; | ||
8 | sha256 = "1fvchp2rhp2rmigx7qglf69xvjqvzq7x0g49naliw29r2bz656sy"; | ||
9 | type = "gem"; | ||
10 | }; | ||
11 | version = "2.7.0"; | ||
12 | }; | ||
13 | colorator = { | ||
14 | groups = ["default" "jekyll_plugins"]; | ||
15 | platforms = []; | ||
16 | source = { | ||
17 | remotes = ["https://rubygems.org"]; | ||
18 | sha256 = "0f7wvpam948cglrciyqd798gdc6z3cfijciavd0dfixgaypmvy72"; | ||
19 | type = "gem"; | ||
20 | }; | ||
21 | version = "1.1.0"; | ||
22 | }; | ||
23 | concurrent-ruby = { | ||
24 | groups = ["default" "jekyll_plugins"]; | ||
25 | platforms = []; | ||
26 | source = { | ||
27 | remotes = ["https://rubygems.org"]; | ||
28 | sha256 = "094387x4yasb797mv07cs3g6f08y56virc2rjcpb1k79rzaj3nhl"; | ||
29 | type = "gem"; | ||
30 | }; | ||
31 | version = "1.1.6"; | ||
32 | }; | ||
33 | em-websocket = { | ||
34 | dependencies = ["eventmachine" "http_parser.rb"]; | ||
35 | groups = ["default" "jekyll_plugins"]; | ||
36 | platforms = []; | ||
37 | source = { | ||
38 | remotes = ["https://rubygems.org"]; | ||
39 | sha256 = "1bsw8vjz0z267j40nhbmrvfz7dvacq4p0pagvyp17jif6mj6v7n3"; | ||
40 | type = "gem"; | ||
41 | }; | ||
42 | version = "0.5.1"; | ||
43 | }; | ||
44 | eventmachine = { | ||
45 | groups = ["default" "jekyll_plugins"]; | ||
46 | platforms = []; | ||
47 | source = { | ||
48 | remotes = ["https://rubygems.org"]; | ||
49 | sha256 = "0wh9aqb0skz80fhfn66lbpr4f86ya2z5rx6gm5xlfhd05bj1ch4r"; | ||
50 | type = "gem"; | ||
51 | }; | ||
52 | version = "1.2.7"; | ||
53 | }; | ||
54 | ffi = { | ||
55 | groups = ["default" "jekyll_plugins"]; | ||
56 | platforms = []; | ||
57 | source = { | ||
58 | remotes = ["https://rubygems.org"]; | ||
59 | sha256 = "1y9y4pkfbjvzp7fdvikz5nxccan8v1x0ppb18a5333v0z3pv3y86"; | ||
60 | type = "gem"; | ||
61 | }; | ||
62 | version = "1.13.0"; | ||
63 | }; | ||
64 | forwardable-extended = { | ||
65 | groups = ["default" "jekyll_plugins"]; | ||
66 | platforms = []; | ||
67 | source = { | ||
68 | remotes = ["https://rubygems.org"]; | ||
69 | sha256 = "15zcqfxfvsnprwm8agia85x64vjzr2w0xn9vxfnxzgcv8s699v0v"; | ||
70 | type = "gem"; | ||
71 | }; | ||
72 | version = "2.6.0"; | ||
73 | }; | ||
74 | "http_parser.rb" = { | ||
75 | groups = ["default" "jekyll_plugins"]; | ||
76 | platforms = []; | ||
77 | source = { | ||
78 | remotes = ["https://rubygems.org"]; | ||
79 | sha256 = "15nidriy0v5yqfjsgsra51wmknxci2n2grliz78sf9pga3n0l7gi"; | ||
80 | type = "gem"; | ||
81 | }; | ||
82 | version = "0.6.0"; | ||
83 | }; | ||
84 | i18n = { | ||
85 | dependencies = ["concurrent-ruby"]; | ||
86 | groups = ["default" "jekyll_plugins"]; | ||
87 | platforms = []; | ||
88 | source = { | ||
89 | remotes = ["https://rubygems.org"]; | ||
90 | sha256 = "038qvz7kd3cfxk8bvagqhakx68pfbnmghpdkx7573wbf0maqp9a3"; | ||
91 | type = "gem"; | ||
92 | }; | ||
93 | version = "0.9.5"; | ||
94 | }; | ||
95 | jekyll = { | ||
96 | dependencies = ["addressable" "colorator" "em-websocket" "i18n" "jekyll-sass-converter" "jekyll-watch" "kramdown" "liquid" "mercenary" "pathutil" "rouge" "safe_yaml"]; | ||
97 | groups = ["default" "jekyll_plugins"]; | ||
98 | platforms = []; | ||
99 | source = { | ||
100 | remotes = ["https://rubygems.org"]; | ||
101 | sha256 = "13gi6v6ib925v9r0w3a3dqvbhj9rrwbbpkr3slisfxwpwy6k0kyp"; | ||
102 | type = "gem"; | ||
103 | }; | ||
104 | version = "3.8.7"; | ||
105 | }; | ||
106 | jekyll-feed = { | ||
107 | dependencies = ["jekyll"]; | ||
108 | groups = ["jekyll_plugins"]; | ||
109 | platforms = []; | ||
110 | source = { | ||
111 | remotes = ["https://rubygems.org"]; | ||
112 | sha256 = "1lx8nvkhd8l1wm3b6s506rycwbmpbzbsbjl65p21asjz6vbwf1ir"; | ||
113 | type = "gem"; | ||
114 | }; | ||
115 | version = "0.13.0"; | ||
116 | }; | ||
117 | jekyll-paginate-v2 = { | ||
118 | dependencies = ["jekyll"]; | ||
119 | groups = ["jekyll_plugins"]; | ||
120 | platforms = []; | ||
121 | source = { | ||
122 | remotes = ["https://rubygems.org"]; | ||
123 | sha256 = "0hkl5vfgrz4p0j5dgji0rhnv081y4mrvsy2lnnzl0zv9rd5gqsn7"; | ||
124 | type = "gem"; | ||
125 | }; | ||
126 | version = "1.9.0"; | ||
127 | }; | ||
128 | jekyll-sass-converter = { | ||
129 | dependencies = ["sass"]; | ||
130 | groups = ["default" "jekyll_plugins"]; | ||
131 | platforms = []; | ||
132 | source = { | ||
133 | remotes = ["https://rubygems.org"]; | ||
134 | sha256 = "008ikh5fk0n6ri54mylcl8jn0mq8p2nfyfqif2q3pp0lwilkcxsk"; | ||
135 | type = "gem"; | ||
136 | }; | ||
137 | version = "1.5.2"; | ||
138 | }; | ||
139 | jekyll-seo-tag = { | ||
140 | dependencies = ["jekyll"]; | ||
141 | groups = ["default"]; | ||
142 | platforms = []; | ||
143 | source = { | ||
144 | remotes = ["https://rubygems.org"]; | ||
145 | sha256 = "1p9fl2r4ni10lbx143zp41caldjs4hg27az5wg42sbwzb7s6z66m"; | ||
146 | type = "gem"; | ||
147 | }; | ||
148 | version = "2.6.1"; | ||
149 | }; | ||
150 | jekyll-watch = { | ||
151 | dependencies = ["listen"]; | ||
152 | groups = ["default" "jekyll_plugins"]; | ||
153 | platforms = []; | ||
154 | source = { | ||
155 | remotes = ["https://rubygems.org"]; | ||
156 | sha256 = "1qd7hy1kl87fl7l0frw5qbn22x7ayfzlv9a5ca1m59g0ym1ysi5w"; | ||
157 | type = "gem"; | ||
158 | }; | ||
159 | version = "2.2.1"; | ||
160 | }; | ||
161 | kramdown = { | ||
162 | groups = ["default" "jekyll_plugins"]; | ||
163 | platforms = []; | ||
164 | source = { | ||
165 | remotes = ["https://rubygems.org"]; | ||
166 | sha256 = "1n1c4jmrh5ig8iv1rw81s4mw4xsp4v97hvf8zkigv4hn5h542qjq"; | ||
167 | type = "gem"; | ||
168 | }; | ||
169 | version = "1.17.0"; | ||
170 | }; | ||
171 | liquid = { | ||
172 | groups = ["default" "jekyll_plugins"]; | ||
173 | platforms = []; | ||
174 | source = { | ||
175 | remotes = ["https://rubygems.org"]; | ||
176 | sha256 = "0zhg5ha8zy8zw9qr3fl4wgk4r5940n4128xm2pn4shpbzdbsj5by"; | ||
177 | type = "gem"; | ||
178 | }; | ||
179 | version = "4.0.3"; | ||
180 | }; | ||
181 | listen = { | ||
182 | dependencies = ["rb-fsevent" "rb-inotify"]; | ||
183 | groups = ["default" "jekyll_plugins"]; | ||
184 | platforms = []; | ||
185 | source = { | ||
186 | remotes = ["https://rubygems.org"]; | ||
187 | sha256 = "1w923wmdi3gyiky0asqdw5dnh3gcjs2xyn82ajvjfjwh6sn0clgi"; | ||
188 | type = "gem"; | ||
189 | }; | ||
190 | version = "3.2.1"; | ||
191 | }; | ||
192 | mercenary = { | ||
193 | groups = ["default" "jekyll_plugins"]; | ||
194 | platforms = []; | ||
195 | source = { | ||
196 | remotes = ["https://rubygems.org"]; | ||
197 | sha256 = "10la0xw82dh5mqab8bl0dk21zld63cqxb1g16fk8cb39ylc4n21a"; | ||
198 | type = "gem"; | ||
199 | }; | ||
200 | version = "0.3.6"; | ||
201 | }; | ||
202 | minima = { | ||
203 | dependencies = ["jekyll" "jekyll-feed" "jekyll-seo-tag"]; | ||
204 | groups = ["default"]; | ||
205 | platforms = []; | ||
206 | source = { | ||
207 | remotes = ["https://rubygems.org"]; | ||
208 | sha256 = "1gk7jmriiswda1ykjzpsw9cpiya4m9n0yrh0h6xnrc8zcfy543jj"; | ||
209 | type = "gem"; | ||
210 | }; | ||
211 | version = "2.5.1"; | ||
212 | }; | ||
213 | pathutil = { | ||
214 | dependencies = ["forwardable-extended"]; | ||
215 | groups = ["default" "jekyll_plugins"]; | ||
216 | platforms = []; | ||
217 | source = { | ||
218 | remotes = ["https://rubygems.org"]; | ||
219 | sha256 = "12fm93ljw9fbxmv2krki5k5wkvr7560qy8p4spvb9jiiaqv78fz4"; | ||
220 | type = "gem"; | ||
221 | }; | ||
222 | version = "0.16.2"; | ||
223 | }; | ||
224 | public_suffix = { | ||
225 | groups = ["default" "jekyll_plugins"]; | ||
226 | platforms = []; | ||
227 | source = { | ||
228 | remotes = ["https://rubygems.org"]; | ||
229 | sha256 = "0vywld400fzi17cszwrchrzcqys4qm6sshbv73wy5mwcixmrgg7g"; | ||
230 | type = "gem"; | ||
231 | }; | ||
232 | version = "4.0.5"; | ||
233 | }; | ||
234 | rb-fsevent = { | ||
235 | groups = ["default" "jekyll_plugins"]; | ||
236 | platforms = []; | ||
237 | source = { | ||
238 | remotes = ["https://rubygems.org"]; | ||
239 | sha256 = "1k9bsj7ni0g2fd7scyyy1sk9dy2pg9akniahab0iznvjmhn54h87"; | ||
240 | type = "gem"; | ||
241 | }; | ||
242 | version = "0.10.4"; | ||
243 | }; | ||
244 | rb-inotify = { | ||
245 | dependencies = ["ffi"]; | ||
246 | groups = ["default" "jekyll_plugins"]; | ||
247 | platforms = []; | ||
248 | source = { | ||
249 | remotes = ["https://rubygems.org"]; | ||
250 | sha256 = "1jm76h8f8hji38z3ggf4bzi8vps6p7sagxn3ab57qc0xyga64005"; | ||
251 | type = "gem"; | ||
252 | }; | ||
253 | version = "0.10.1"; | ||
254 | }; | ||
255 | rouge = { | ||
256 | groups = ["default" "jekyll_plugins"]; | ||
257 | platforms = []; | ||
258 | source = { | ||
259 | remotes = ["https://rubygems.org"]; | ||
260 | sha256 = "102rc07d78k5bkl0s9nd1gw6wz0w0zcvg4g5sl7z9xxi4r793c35"; | ||
261 | type = "gem"; | ||
262 | }; | ||
263 | version = "3.19.0"; | ||
264 | }; | ||
265 | safe_yaml = { | ||
266 | groups = ["default" "jekyll_plugins"]; | ||
267 | platforms = []; | ||
268 | source = { | ||
269 | remotes = ["https://rubygems.org"]; | ||
270 | sha256 = "0j7qv63p0vqcd838i2iy2f76c3dgwzkiz1d1xkg7n0pbnxj2vb56"; | ||
271 | type = "gem"; | ||
272 | }; | ||
273 | version = "1.0.5"; | ||
274 | }; | ||
275 | sass = { | ||
276 | dependencies = ["sass-listen"]; | ||
277 | groups = ["default" "jekyll_plugins"]; | ||
278 | platforms = []; | ||
279 | source = { | ||
280 | remotes = ["https://rubygems.org"]; | ||
281 | sha256 = "0p95lhs0jza5l7hqci1isflxakz83xkj97lkvxl919is0lwhv2w0"; | ||
282 | type = "gem"; | ||
283 | }; | ||
284 | version = "3.7.4"; | ||
285 | }; | ||
286 | sass-listen = { | ||
287 | dependencies = ["rb-fsevent" "rb-inotify"]; | ||
288 | groups = ["default" "jekyll_plugins"]; | ||
289 | platforms = []; | ||
290 | source = { | ||
291 | remotes = ["https://rubygems.org"]; | ||
292 | sha256 = "0xw3q46cmahkgyldid5hwyiwacp590zj2vmswlll68ryvmvcp7df"; | ||
293 | type = "gem"; | ||
294 | }; | ||
295 | version = "4.0.0"; | ||
296 | }; | ||
297 | } \ No newline at end of file | ||
diff --git a/modules/private/websites/immae/history/index.html b/modules/private/websites/immae/history/index.html deleted file mode 100644 index e9226e4..0000000 --- a/modules/private/websites/immae/history/index.html +++ /dev/null | |||
@@ -1,18 +0,0 @@ | |||
1 | --- | ||
2 | layout: default | ||
3 | permalink: / | ||
4 | pagination: | ||
5 | permalink: /page/:num/ | ||
6 | enabled: true | ||
7 | indexpage: 'index' | ||
8 | --- | ||
9 | <div class="post_list"> | ||
10 | {% for post in paginator.posts %} | ||
11 | {% include post.html title=post.title category=post.category url=post.url date=post.date content=post.content %} | ||
12 | <hr> | ||
13 | {% endfor %} | ||
14 | |||
15 | {% if paginator.next_page %} | ||
16 | <a href="{{ paginator.next_page_path | replace: 'index.html', '' | prepend: site.baseurl }}" class="d-block text-center p-3 text-muted next-page">Load More Updates</a> | ||
17 | {% endif %} | ||
18 | </div> \ No newline at end of file | ||
diff --git a/modules/private/websites/immae/production.nix b/modules/private/websites/immae/production.nix index 046246d..bb110de 100644 --- a/modules/private/websites/immae/production.nix +++ b/modules/private/websites/immae/production.nix | |||
@@ -5,7 +5,7 @@ let | |||
5 | coursDir = "/var/lib/buildbot/outputs/cours"; | 5 | coursDir = "/var/lib/buildbot/outputs/cours"; |
6 | rechercheDir = "/var/lib/buildbot/outputs/recherche"; | 6 | rechercheDir = "/var/lib/buildbot/outputs/recherche"; |
7 | recettesDir = "/var/lib/buildbot/outputs/recettes"; | 7 | recettesDir = "/var/lib/buildbot/outputs/recettes"; |
8 | historyDir = pkgs.callPackage ./history {}; | 8 | historyDir = "/var/lib/buildbot/outputs/immae/history"; |
9 | env = config.myEnv.websites.immae; | 9 | env = config.myEnv.websites.immae; |
10 | in { | 10 | in { |
11 | options.myServices.websites.immae.production.enable = lib.mkEnableOption "enable Immae's website"; | 11 | options.myServices.websites.immae.production.enable = lib.mkEnableOption "enable Immae's website"; |
diff --git a/nix/sources.json b/nix/sources.json index dd27752..e76ae81 100644 --- a/nix/sources.json +++ b/nix/sources.json | |||
@@ -17,6 +17,12 @@ | |||
17 | "url": "https://github.com/NixOS/nixpkgs-channels/archive/fce7562cf46727fdaf801b232116bc9ce0512049.tar.gz", | 17 | "url": "https://github.com/NixOS/nixpkgs-channels/archive/fce7562cf46727fdaf801b232116bc9ce0512049.tar.gz", |
18 | "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" | 18 | "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" |
19 | }, | 19 | }, |
20 | "buildbot-history-deps": { | ||
21 | "ref": "master", | ||
22 | "repo": "ssh://gitolite@git.immae.eu/perso/Immae/Sites/History", | ||
23 | "rev": "5f2aae4f9c92107accfc6fb6db6cb3c1f97ed9dc", | ||
24 | "type": "git" | ||
25 | }, | ||
20 | "buildbot-normalesup-deps": { | 26 | "buildbot-normalesup-deps": { |
21 | "ref": "master", | 27 | "ref": "master", |
22 | "repo": "ssh://gitolite@git.immae.eu/perso/Immae/Projets/Sites/Normalesup", | 28 | "repo": "ssh://gitolite@git.immae.eu/perso/Immae/Projets/Sites/Normalesup", |