diff options
| author | Simon Rettberg | 2015-02-24 16:26:17 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2015-02-24 16:26:17 +0100 |
| commit | a566736e62ebca8a0e93c5c07c3c07cceded9826 (patch) | |
| tree | 2aaa537d644c5c6b473b458e0dc287bfa7796ca0 /src | |
| parent | Fix AD pam and scripts (diff) | |
| download | tmlite-bwlp-a566736e62ebca8a0e93c5c07c3c07cceded9826.tar.gz tmlite-bwlp-a566736e62ebca8a0e93c5c07c3c07cceded9826.tar.xz tmlite-bwlp-a566736e62ebca8a0e93c5c07c3c07cceded9826.zip | |
Bump
Diffstat (limited to 'src')
3 files changed, 11 insertions, 2 deletions
diff --git a/src/main/java/org/openslx/taskmanager/tasks/CreateAdConfig.java b/src/main/java/org/openslx/taskmanager/tasks/CreateAdConfig.java index ee3bfb8..c07d337 100644 --- a/src/main/java/org/openslx/taskmanager/tasks/CreateAdConfig.java +++ b/src/main/java/org/openslx/taskmanager/tasks/CreateAdConfig.java @@ -9,6 +9,7 @@ import java.nio.file.Paths; import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream; import org.apache.commons.io.FileUtils; import org.openslx.satserver.util.Archive; +import org.openslx.satserver.util.Constants; import org.openslx.satserver.util.Exec; import org.openslx.satserver.util.Template; import org.openslx.satserver.util.Util; @@ -110,6 +111,13 @@ public class CreateAdConfig extends AbstractTask } try { FileUtils.writeStringToFile( new File( fileName ), ldadpConf, StandardCharsets.UTF_8 ); + if ( 0 != Exec.sync( + "/usr/bin/sudo", + "-n", + "-u", "root", + Constants.BASEDIR + "/scripts/ldadp-setperms", + Integer.toString( this.moduleid ) ) ) + status.error = "Could not chown/chmod ldadp config!"; } catch ( IOException e ) { status.error = e.toString(); return false; @@ -144,7 +152,7 @@ public class CreateAdConfig extends AbstractTask return false; } boolean ret = Archive.tarCreateFileFromString( outArchive, "/etc/ldap.conf", ldapConf.toString(), 0644 ) - && Archive.tarCreateFileFromString( outArchive, "/etc/sssd/sssd.conf", sssdConf.toString(), 0644 ) + && Archive.tarCreateFileFromString( outArchive, "/etc/sssd/sssd.conf", sssdConf.toString(), 0600 ) && Archive.tarCreateSymlink( outArchive, "/etc/ldap.conf", "/etc/ldap/ldap.conf" ) && Archive.tarCreateSymlink( outArchive, "/etc/ldap.conf", "/etc/openldap/ldap.conf" ) && Archive.tarCreateSymlink( outArchive, "../sssd.service", "/etc/systemd/system/basic.target.wants/sssd.service" ); diff --git a/src/main/java/org/openslx/taskmanager/tasks/DownloadFile.java b/src/main/java/org/openslx/taskmanager/tasks/DownloadFile.java index dc36cfc..607ca9a 100644 --- a/src/main/java/org/openslx/taskmanager/tasks/DownloadFile.java +++ b/src/main/java/org/openslx/taskmanager/tasks/DownloadFile.java @@ -76,6 +76,7 @@ public class DownloadFile extends AbstractTask status.progress++; } fout.close(); + in.close(); // If we have a gpg sig, validate if ( this.gpg != null && !this.gpg.isEmpty() ) { File gpgTempFile = null; diff --git a/src/main/java/org/openslx/taskmanager/tasks/DownloadText.java b/src/main/java/org/openslx/taskmanager/tasks/DownloadText.java index 76881d0..498af79 100644 --- a/src/main/java/org/openslx/taskmanager/tasks/DownloadText.java +++ b/src/main/java/org/openslx/taskmanager/tasks/DownloadText.java @@ -20,7 +20,7 @@ public class DownloadText extends AbstractTask private Output status = new Output(); - private static final long MAX_SIZE = 10000; + private static final long MAX_SIZE = 50000; @Override protected boolean initTask() |