diff options
| author | Simon Rettberg | 2015-09-30 11:30:51 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2015-09-30 11:30:51 +0200 |
| commit | e9cdf1e5abce0f4933b9ab8830521d56e1073861 (patch) | |
| tree | d98abd32756c7ffc112608aeaedd87a951247c37 | |
| parent | [MountVmStore] Timeout quicker, return exit code in status (diff) | |
| download | tmlite-bwlp-e9cdf1e5abce0f4933b9ab8830521d56e1073861.tar.gz tmlite-bwlp-e9cdf1e5abce0f4933b9ab8830521d56e1073861.tar.xz tmlite-bwlp-e9cdf1e5abce0f4933b9ab8830521d56e1073861.zip | |
[Https] Increase timeouts, use systemctl fort restart
| -rwxr-xr-x | scripts/install-https | 2 | ||||
| -rw-r--r-- | src/main/java/org/openslx/taskmanager/tasks/LighttpdHttps.java | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/scripts/install-https b/scripts/install-https index cfefe8b..f31271a 100755 --- a/scripts/install-https +++ b/scripts/install-https @@ -72,7 +72,7 @@ case "$OP" in ;; esac -service lighttpd restart +systemctl restart lighttpd exit 0 diff --git a/src/main/java/org/openslx/taskmanager/tasks/LighttpdHttps.java b/src/main/java/org/openslx/taskmanager/tasks/LighttpdHttps.java index e69907e..2829baf 100644 --- a/src/main/java/org/openslx/taskmanager/tasks/LighttpdHttps.java +++ b/src/main/java/org/openslx/taskmanager/tasks/LighttpdHttps.java @@ -75,16 +75,16 @@ public class LighttpdHttps extends AbstractTask return false; } int ret; - ret = Exec.sync( 10, "/opt/taskmanager/scripts/install-https", "--test", tmpKey.getAbsolutePath(), tmpCert.getAbsolutePath() ); + ret = Exec.sync( 15, "/opt/taskmanager/scripts/install-https", "--test", tmpKey.getAbsolutePath(), tmpCert.getAbsolutePath() ); if ( ret != 0 ) { status.error = "Given key and certificate do not match, or have invalid format (exit code: " + ret + ")"; return false; } if ( tmpChain != null ) { - ret = Exec.sync( 10, "sudo", "-n", "-u", "root", "/opt/taskmanager/scripts/install-https", "--import", tmpKey.getAbsolutePath(), tmpCert.getAbsolutePath(), + ret = Exec.sync( 15, "sudo", "-n", "-u", "root", "/opt/taskmanager/scripts/install-https", "--import", tmpKey.getAbsolutePath(), tmpCert.getAbsolutePath(), tmpChain.getAbsolutePath() ); } else { - ret = Exec.sync( 10, "sudo", "-n", "-u", "root", "/opt/taskmanager/scripts/install-https", "--import", tmpKey.getAbsolutePath(), tmpCert.getAbsolutePath() ); + ret = Exec.sync( 15, "sudo", "-n", "-u", "root", "/opt/taskmanager/scripts/install-https", "--import", tmpKey.getAbsolutePath(), tmpCert.getAbsolutePath() ); } if ( ret != 0 ) { status.error = "import exited with code " + ret; @@ -101,7 +101,7 @@ public class LighttpdHttps extends AbstractTask private boolean disableHttps() { - int ret = Exec.sync( 10, "sudo", "-n", "-u", "root", "/opt/taskmanager/scripts/install-https", "--disable" ); + int ret = Exec.sync( 15, "sudo", "-n", "-u", "root", "/opt/taskmanager/scripts/install-https", "--disable" ); if ( ret != 0 ) { status.error = "disable exited with code " + ret; return false; |