[debian-edu-commits] [Git][debian-edu/debian-edu-config][master] Provide Debian Edu RootCA certificate (pub key) for download. (Closes: #933183)

[WolfgangSchweer]

WolfgangSchweer pushed to branch master at Debian Edu / debian-edu-config


Commits:
b4fecb09 by Wolfgang Schweer at 2019-07-27T11:41:19Z
Provide Debian Edu RootCA certificate (pub key) for download. (Closes: #933183)

Adjust debian/debian-edu-config.fetch-ldap-cert to copy the rootCA file to the
web server directory at certificate generation time.

Adjust cf3/cf.finalize to care for the rootCA file as well.

Adjust cf3/cf.workarounds to copy the rootCA file to the web server directory
upon main server upgrade.

Signed-off-by: Wolfgang Schweer <wschweer at arcor.de>

- - - - -


4 changed files:

- cf3/cf.finalize
- cf3/cf.workarounds
- debian/changelog
- share/debian-edu-config/tools/create-debian-edu-certs


Changes:

=====================================
cf3/cf.finalize
=====================================
@@ -66,6 +66,8 @@ files:
     copy_from => local_cp("/etc/ssl/certs/debian-edu-server.crt");
     "/opt/ltsp/$(default_arch)/etc/ssl/certs/debian-edu-bundle.crt"
     copy_from => local_cp("/etc/ssl/certs/debian-edu-bundle.crt");
+    "/opt/ltsp/$(default_arch)/etc/ssl/certs/Debian-Edu_rootCA.crt"
+    copy_from => local_cp("/etc/ssl/certs/Debian-Edu_rootCA.crt");
 
 commands:
 
@@ -124,11 +126,16 @@ commands:
 
   # Adjust certificate rights to make them accessible.
 
+  debian.server.installation::
+
+    "/bin/chmod 0644 /etc/debian-edu/www/Debian-Edu_rootCA.crt"
+      contain => in_shell;
+
   debian.ltspclient.installation::
 
     "/bin/chmod 0644 /etc/ssl/certs/debian-edu*.crt"
       contain => in_shell;
-    "/bin/chmod 0644 /opt/ltsp/*/etc/ssl/certs/debian-edu*.crt"
+    "/bin/chmod 0644 /etc/ssl/certs/Debian-Edu_rootCA.crt"
       contain => in_shell;
 
   # Note that 'ltsp-update-image --config-nbd' is needed to generate the image and


=====================================
cf3/cf.workarounds
=====================================
@@ -33,6 +33,12 @@ files:
       link_from => ln_s("/usr/share/debian-edu-config/edu-firefox-nfs"),
       move_obstructions => "true";
 
+  # Provide Debian Edu RootCA pub key file for download.
+
+  debian.server.installation::
+    "/etc/debian-edu/www/Debian-Edu_rootCA.crt"
+    copy_from => local_cp("/etc/ssl/certs/Debian-Edu_rootCA.crt");
+
 commands:
 
   debian.xfce.(ltspclient|ltspserver).installation::


=====================================
debian/changelog
=====================================
@@ -30,6 +30,12 @@ debian-edu-config (2.10.66) UNRELEASED; urgency=medium
     - cf3/edu.cf: Define new class 'ltspimages'.
     - cf3/cf.finalize: Add code to include the LDAP server certificate for all
       possible use cases, to generate the image and to adjust various rights.
+  * Provide Debian Edu RootCA certificate for download. (Closes: #933183)
+    - Adjust debian/debian-edu-config.fetch-ldap-cert to copy the rootCA file
+      to the web server directory at certificate generation time.
+    - Adjust cf3/cf.finalize to care for the rootCA file as well.
+    - Adjust cf3/cf.workarounds to copy the rootCA file to the web server
+      directory upon main server upgrade.
 
   [ Mike Gabriel ]
   * debian/debian-edu-config.fetch-ldap-cert: Make the script (and with it


=====================================
share/debian-edu-config/tools/create-debian-edu-certs
=====================================
@@ -72,7 +72,9 @@ generate() {
     # available via web-server.
     cp /etc/ssl/certs/debian-edu-bundle.crt /etc/debian-edu/www
     cp /etc/ssl/certs/debian-edu-bundle.pem /etc/debian-edu/www
+    cp /etc/ssl/certs/Debian-Edu_rootCA.crt /etc/debian-edu/www
     chmod 644 /etc/debian-edu/www/debian-edu-bundle.*
+    chmod 644 /etc/debian-edu/www/Debian-Edu_rootCA.crt
     logger -t create-debian-edu-certs "Certs with both .crt and .pem extension made available in /etc/debian-edu/www."
 }
 



View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/commit/b4fecb0988443854c9c2389766f3926e0febf9f7

-- 
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/commit/b4fecb0988443854c9c2389766f3926e0febf9f7
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-edu-commits/attachments/20190727/a41d0734/attachment-0001.html>