Make some adjustments for Denise aventuriers page

2 files changed, 10 insertions, 7 deletions

diff --git a/modules/private/buildbot/projects/denise/__init__.py b/modules/private/buildbot/projects/denise/__init__.py
index bd460d1..e91e17a 100644
--- a/modules/private/buildbot/projects/denise/__init__.py
+++ b/modules/private/buildbot/projects/denise/__init__.py
@@ -83,22 +83,25 @@ def denise_aventuriers_factory():
 
     factory = util.BuildFactory()
     factory.addStep(steps.Git(logEnviron=False, repourl=E.AVENTURIERS_GIT_URL,
-        submodules=True, mode="full", method="copy"))
+        submodules=True, mode="full", method="fresh"))
     factory.addStep(steps.ShellCommand(name="build files",
-        logEnviron=False, haltOnFailure=True, workdir="source",
+        logEnviron=False, haltOnFailure=True, workdir="build",
         env=path_env, command=["make", "tout", "encyclo"]))
     factory.addStep(steps.MasterShellCommand(command="rm -rf {}".format(E.AVENTURIERS_RELEASE_PATH)))
-    factory.addStep(steps.DirectoryUpload(workersrc="../source/html",
+    factory.addStep(steps.DirectoryUpload(workersrc="../build/html",
         masterdest=E.AVENTURIERS_RELEASE_PATH,
         url="https://aventuriers.syanni.eu"))
+    factory.addStep(steps.FileUpload(name="upload epub file", workersrc="aventuriers.epub",
+        workdir="build", masterdest=E.AVENTURIERS_RELEASE_PATH + "/aventuriers.epub",
+        url="https://aventuriers.syanni.eu/aventuriers.epub", mode=0o644))
     factory.addStep(steps.FileUpload(name="upload mobi file", workersrc="aventuriers.mobi",
-        workdir="source", masterdest=E.AVENTURIERS_RELEASE_PATH + "/aventuriers.mobi",
+        workdir="build", masterdest=E.AVENTURIERS_RELEASE_PATH + "/aventuriers.mobi",
         url="https://aventuriers.syanni.eu/aventuriers.mobi", mode=0o644))
     factory.addStep(steps.FileUpload(name="upload pdf file", workersrc="aventuriers.pdf",
-        workdir="source", masterdest=E.AVENTURIERS_RELEASE_PATH + "/aventuriers.pdf",
+        workdir="build", masterdest=E.AVENTURIERS_RELEASE_PATH + "/aventuriers.pdf",
         url="https://aventuriers.syanni.eu/aventuriers.pdf", mode=0o644))
     factory.addStep(steps.FileUpload(name="upload encyclo pdf file", workersrc="encyclo.pdf",
-        workdir="source", masterdest=E.AVENTURIERS_RELEASE_PATH + "/encyclo.pdf",
+        workdir="build", masterdest=E.AVENTURIERS_RELEASE_PATH + "/encyclo.pdf",
         url="https://aventuriers.syanni.eu/encyclo.pdf", mode=0o644))
     factory.addStep(steps.MasterShellCommand(command="chmod -R a+rX {}".format(E.AVENTURIERS_RELEASE_PATH)))
 
diff --git a/modules/private/websites/denise/aventuriers.nix b/modules/private/websites/denise/aventuriers.nix
index 33df53e..2bbf7bf 100644
--- a/modules/private/websites/denise/aventuriers.nix
+++ b/modules/private/websites/denise/aventuriers.nix
@@ -14,7 +14,7 @@ in {
       extraConfig  = [
         ''
           <Directory ${varDir}>
-            DirectoryIndex index.html
+            DirectoryIndex aventuriers.html
             Options Indexes FollowSymLinks MultiViews Includes
             AllowOverride None
             Require all granted