From 97f5a24bc8839328571b23eb5f910de206ddbe1f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Isma=C3=ABl=20Bouya?= Date: Thu, 7 Oct 2021 15:14:03 +0200 Subject: [PATCH] Add documentation website --- .../buildbot/projects/immaeEu/__init__.py | 29 +++++++++++++++++-- modules/private/websites/immae/production.nix | 9 ++++++ nix/sources.json | 2 +- nixops/secrets | 2 +- 4 files changed, 37 insertions(+), 5 deletions(-) diff --git a/modules/private/buildbot/projects/immaeEu/__init__.py b/modules/private/buildbot/projects/immaeEu/__init__.py index f119b4f..83265cd 100644 --- a/modules/private/buildbot/projects/immaeEu/__init__.py +++ b/modules/private/buildbot/projects/immaeEu/__init__.py @@ -20,6 +20,7 @@ class E(): HISTORY_GIT_URL = "gitolite@git.immae.eu:perso/Immae/Sites/History" RECETTES_GIT_URL = "gitolite@git.immae.eu:perso/Immae/Sites/Recettes" COURS_GIT_URL = "gitolite@git.immae.eu:perso/Immae/Sites/Cours" + DOCS_GIT_URL = "gitolite@git.immae.eu:perso/Immae/Sites/Docs" NORMALESUP_GIT_URL = "gitolite@git.immae.eu:perso/Immae/Projets/Sites/Normalesup" COURS_RELEASE_PATH = "/var/lib/buildbot/outputs/immae/cours" @@ -28,6 +29,7 @@ class E(): BIP39_RELEASE_PATH = "/var/lib/buildbot/outputs/immae/bip39" HISTORY_RELEASE_PATH = "/var/lib/buildbot/outputs/immae/history" IMMAE_EU_RELEASE_PATH = "/var/lib/buildbot/outputs/immae/blog" + DOCS_RELEASE_PATH = "/var/lib/buildbot/outputs/immae/docs" RECETTES_RELEASE_PATH = "/var/lib/buildbot/outputs/immae/recettes" NORMALESUP_RELEASE_PATH = "/var/lib/buildbot/outputs/immae/recherche" GSMCELLS_RELEASE_PATH = "/var/lib/ftp/release.immae.eu/gsm_cells" @@ -70,12 +72,13 @@ def configure(c): c['schedulers'].append(hook_scheduler("Normalesup", timer=1)) c['schedulers'].append(hook_scheduler("Cours", timer=1)) c['schedulers'].append(hook_scheduler("Recettes", timer=1)) + c['schedulers'].append(hook_scheduler("Docs", timer=1)) c['schedulers'].append(hook_scheduler("History", timer=1)) c['schedulers'].append(hook_scheduler("BIP39", timer=1)) c['schedulers'].append(schedulers.Nightly(name="GSMCells-weekly", builderNames=["GSMCells_build"], dayOfWeek=6, hour=3)) c['schedulers'].append(force_scheduler("force_immae_eu", [ - "ImmaeEu_build", "Normalesup_build", "Cours_build", + "ImmaeEu_build", "Normalesup_build", "Cours_build", "Docs_build", "Recettes_build", "History_build", "BIP39_build" ])) c['schedulers'].append(schedulers.ForceScheduler( @@ -99,13 +102,14 @@ def configure(c): c['builders'].append(cours_factory()) c['builders'].append(gsm_cells_factory()) c['builders'].append(recettes_factory()) + c['builders'].append(docs_factory()) c['builders'].append(history_factory()) c['builders'].append(bip39_factory()) c['services'].append(SlackStatusPush( name="slack_status_immae_eu_project", builders=[ - "ImmaeEu_build", "Normalesup_build", "Cours_build", + "ImmaeEu_build", "Normalesup_build", "Cours_build", "Docs_build", "GSMCells_build", "Recettes_build", "History_build", "BIP39_build" ], @@ -113,7 +117,7 @@ def configure(c): c['services'].append(XMPPStatusPush( name="xmpp_status_immae_eu_project", builders=[ - "ImmaeEu_build", "Normalesup_build", "Cours_build", + "ImmaeEu_build", "Normalesup_build", "Cours_build", "Docs_build", "GSMCells_build", "Recettes_build", "History_build", "BIP39_build" ], @@ -139,6 +143,25 @@ def history_factory(): return util.BuilderConfig(name="History_build", workernames=["generic-worker-immae-eu"], factory=factory) +def docs_factory(): + path_env = { + "PATH": os.environ["BUILDBOT_PATH_Docs"] + ":${PATH}" + } + factory = util.BuildFactory() + factory.addStep(steps.Git(logEnviron=False, repourl=E.DOCS_GIT_URL, + submodules=True, sshPrivateKey=open(E.SSH_KEY_PATH).read().rstrip(), + sshHostKey=E.SSH_HOST_KEY, mode="full", method="copy")) + factory.addStep(steps.ShellCommand(name="build website", + logEnviron=False, haltOnFailure=True, workdir="source", + env=path_env, command=["make", "clean", "html"])) + factory.addStep(steps.MasterShellCommand(command="rm -rf {}".format(E.DOCS_RELEASE_PATH))) + factory.addStep(steps.DirectoryUpload(workersrc="../source/_build/html", + masterdest=E.DOCS_RELEASE_PATH, + url="https://www.immae.eu/docs")) + factory.addStep(steps.MasterShellCommand(command="chmod -R a+rX {}".format(E.DOCS_RELEASE_PATH))) + + return util.BuilderConfig(name="Docs_build", workernames=["generic-worker-immae-eu"], factory=factory) + def recettes_factory(): path_env = { "PATH": os.environ["BUILDBOT_PATH_Recettes"] + ":${PATH}" diff --git a/modules/private/websites/immae/production.nix b/modules/private/websites/immae/production.nix index ff9cf9d..8b4998f 100644 --- a/modules/private/websites/immae/production.nix +++ b/modules/private/websites/immae/production.nix @@ -6,6 +6,7 @@ let rechercheDir = "/var/lib/buildbot/outputs/immae/recherche"; recettesDir = "/var/lib/buildbot/outputs/immae/recettes"; historyDir = "/var/lib/buildbot/outputs/immae/history"; + docsDir = "/var/lib/buildbot/outputs/immae/docs/"; env = config.myEnv.websites.immae; in { options.myServices.websites.immae.production.enable = lib.mkEnableOption "enable Immae's website"; @@ -66,6 +67,14 @@ in { Require all granted + Alias /docs ${docsDir} + + DirectoryIndex index.htm index.html + Options Indexes FollowSymLinks MultiViews Includes + AllowOverride All + Require all granted + + Alias /eurl ${./eurl} DirectoryIndex index.htm index.html diff --git a/nix/sources.json b/nix/sources.json index bf1edce..bc49278 100644 --- a/nix/sources.json +++ b/nix/sources.json @@ -146,7 +146,7 @@ "webapps-landing": { "ref": "gitolite_local/local_changes", "repo": "https://git.immae.eu/github/bastienwirtz/homer.git", - "rev": "136303aa36d7d97f27b5944ad7df3a3c14515d91", + "rev": "49b6104e9d0059b7990b3dcd53cca664d5cce7af", "type": "git", "version": "e0a72b7-local" }, diff --git a/nixops/secrets b/nixops/secrets index d5068b2..3b4bfa3 160000 --- a/nixops/secrets +++ b/nixops/secrets @@ -1 +1 @@ -Subproject commit d5068b2f6e4a8aa7e6e487b34eef0d90e7f547ca +Subproject commit 3b4bfa3cddc7f0621d1bec042a388c32e38245f4 -- 2.41.0