2 Commits

Author SHA1 Message Date
Dustin Frisch 49edeafeaf
bump deps 4 months ago
Dustin Frisch 77cf77aafb
Fix unit tests 4 months ago
  1. 5
      default.nix
  2. 2314
      mvn2nix-lock.json
  3. 1
      pom.xml
  4. 2
      src/main/java/de/hsfulda/informatik/LdapSync.java
  5. 1
      src/test/java/de/hsfulda/informatik/LdapSyncTest.java

5
default.nix

@ -12,8 +12,8 @@ let
mvn2nix = fetchFromGitHub {
owner = "fzakaria";
repo = "mvn2nix";
rev = "e27562cb6fc5b546eb8a3a6be79b7f1ac7676e4b";
hash = "sha256-5ZnRlGhWFD3U9AzCbZ7L8Yf2lTvO81dVv138nbqHEFI=";
rev = "ea21cfe97069feee55fa307ca9b125616c1fa84f";
hash = "sha256-v/HvYqzkPaGin1ujo+Fi59wXC9vWxW3lYVSwElORRi8=";
};
repository = (pkgs.callPackage "${mvn2nix}/maven.nix" {}).buildMavenRepositoryFromLockFile {
@ -44,6 +44,7 @@ in stdenv.mkDerivation rec {
passthru = {
inherit repository;
mvn2nix = pkgs.callPackage "${mvn2nix}/default.nix" { };
};
}

2314
mvn2nix-lock.json
File diff suppressed because it is too large
View File

1
pom.xml

@ -41,6 +41,7 @@
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.6.0</version>
<executions>
<execution>
<id>foobar</id>

2
src/main/java/de/hsfulda/informatik/LdapSync.java

@ -126,7 +126,7 @@ public class LdapSync {
if (properties.getProperty("sync.dst.shell") != null) {
e.addAttribute(new Attribute("loginShell", properties.getProperty("sync.dst.shell")));
}
e.addAttribute(new Attribute("homeDirectory", String.format(properties.getProperty("sync.dst.home"), cn)));
e.addAttribute(new Attribute("homeDirectory", String.format(properties.getProperty("sync.dst.home", "/home/%s"), cn)));
if (properties.getProperty("sync.dst.sasl-password", "false").equals("true")) {
e.addAttribute(new Attribute("userPassword", "{SASL}" + cn));
}

1
src/test/java/de/hsfulda/informatik/LdapSyncTest.java

@ -75,7 +75,6 @@ public class LdapSyncTest {
assertTrue(attributes.contains("uidNumber"));
assertTrue(attributes.contains("gidNumber"));
assertTrue(attributes.contains("homeDirectory"));
assertTrue(attributes.contains("loginShell"));
assertEquals(entry.getAttributeValue("cn").toLowerCase(), entry.getAttributeValue("cn"));
assertEquals(entry.getAttributeValue("uid").toLowerCase(), entry.getAttributeValue("uid"));

Loading…
Cancel
Save