hostsharing/hs.hsadmin
8
1
Fork 0
Code Pull Requests Activity

New domain options and properties for Debian Bookworm #1

Closed
hsh-timotheuspokorra wants to merge 41 commits from TP-202311-vhost-bookworm into rel_4.0
pull from: TP-202311-vhost-bookworm
merge into: hostsharing:rel_4.0
Conversation 1 Commits 41 Files Changed 20 +16 -4
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 694b13bb55 - Show all commits

8
hsarback/src/main/java/de/hsadmin/servlets/JsonPillarServlet.java
View File

@ -152,16 +152,16 @@ public class JsonPillarServlet extends HttpServlet {
}
writer.println(" }");
writer.println(" , \"validsubdomains\": \"" + validSubdomainNames + "\"");
if (passengerPython.length() > 0) {
if (passengerPython != null && passengerPython.length() > 0) {
writer.println(" , \"passengerpython\": \"" + passengerPython + "\"");
}
if (passengerNodejs.length() > 0) {
if (passengerNodejs != null && passengerNodejs.length() > 0) {
writer.println(" , \"passengernodejs\": \"" + passengerNodejs + "\"");
}
if (passengerRuby.length() > 0) {
if (passengerRuby != null && passengerRuby.length() > 0) {
writer.println(" , \"passengerruby\": \"" + passengerRuby + "\"");
}
if (fcgiPhpBin.length() > 0) {
if (fcgiPhpBin != null && fcgiPhpBin.length() > 0) {
writer.println(" , \"fcgiphpbin\": \"" + fcgiPhpBin + "\"");
}
writer.println(" }");

12
qserv/src/main/java/de/hsadmin/mods/dom/Domain.java
View File

@ -208,6 +208,9 @@ public class Domain extends AbstractEntity {
}
public String getPassengerpython() {
if (passengerpython == null) {
return "/usr/bin/python3";
}
return passengerpython;
}
@ -216,6 +219,9 @@ public class Domain extends AbstractEntity {
}
public String getPassengernodejs() {
if (passengernodejs == null) {
return "/usr/bin/node";
}
return passengernodejs;
}
@ -224,6 +230,9 @@ public class Domain extends AbstractEntity {
}
public String getPassengerruby() {
if (passengerruby == null) {
return "/usr/bin/ruby";
}
return passengerruby;
}
@ -232,6 +241,9 @@ public class Domain extends AbstractEntity {
}
public String getFcgiphpbin() {
if (fcgiphpbin == null) {
return "/usr/lib/cgi-bin/php";
}
return fcgiphpbin;
}