@@ -76,6 +76,7 @@ in {
7676 default = ''
7777 zookeeper.root.logger=INFO, CONSOLE
7878 log4j.rootLogger=INFO, CONSOLE
79+ log4j.logger.org.apache.zookeeper.audit.Log4jAuditLogger=INFO, CONSOLE
7980 log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
8081 log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
8182 log4j.appender.CONSOLE.layout.ConversionPattern=[myid:%X{myid}] - %-5p [%t:%C{1}@%L] - %m%n
@@ -128,11 +129,10 @@ in {
128129 description = "Zookeeper Daemon";
129130 wantedBy = [ "multi-user.target" ];
130131 after = [ "network.target" ];
131− environment = { ZOOCFGDIR = configDir; };
132132 serviceConfig = {
133133 ExecStart = ''
134134 ${pkgs.jre}/bin/java \
135− -cp "${cfg.package}/lib/*:${cfg.package}/${cfg.package.name}.jar:${configDir}" \
135+ -cp "${cfg.package}/lib/*:${configDir}" \
136136 ${escapeShellArgs cfg.extraCmdLineOptions} \
137137 -Dzookeeper.datadir.autocreate=false \
138138 ${optionalString cfg.preferIPv4 "-Djava.net.preferIPv4Stack=true"} \
@@ -143,6 +143,7 @@ in {
143143 };
144144 preStart = ''
145145 echo "${toString cfg.id}" > ${cfg.dataDir}/myid
146+ mkdir -p ${cfg.dataDir}/version-2
146147 '';
147148 };
148149