Fix compatibility issue with Apache on Nixpkgs 20.03 or newer

Author: svanderburg

nix/generate-containers.nix

@@ -5,17 +5,14 @@
   wrapper = {};
 }
 // lib.optionalAttrs (config.services.httpd.enable) { apache-webapplication = {
-  documentRoot = config.services.httpd.documentRoot;
+  documentRoot = config.services.httpd.documentRoot or config.services.httpd.virtualHosts.localhost.documentRoot;
 }; }
 // lib.optionalAttrs (config.services.tomcat.axis2.enable) { axis2-webservice = {}; }
 // lib.optionalAttrs (config.services.ejabberd.enable) { ejabberd-dump = {
   ejabberdUser = config.services.ejabberd.user;
 }; }
 // lib.optionalAttrs (config.services.mysql.enable) { mysql-database = {
     mysqlPort = config.services.mysql.port;
-  } // lib.optionalAttrs enableAuthentication {
-    mysqlUsername = "root";
-    mysqlPassword = builtins.readFile (config.services.mysql.rootPassword);
   };
 }
 // lib.optionalAttrs (config.services.postgresql.enable) { postgresql-database = {

version

@@ -1 +1 @@
-0.9
+0.9.1