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

Compare commits

base: hostsharing:13316d265ef484a9e0cb7a8693a2430fd4c6d416
Branches Tags
hostsharing:master
hostsharing:TP-202311-vhost-bookworm
hostsharing:rel_4.0
hostsharing:ipv6
hostsharing:BackupMXForExternalMX-Removal
hostsharing:refact-openejb
hostsharing:refact-processors
hostsharing:prod
hostsharing:v4.0.18
hostsharing:v4.0.15
hostsharing:v4.0.14
hostsharing:v4.0.13
hostsharing:v4.0.12
..
compare: hostsharing:643b23ad34abd94fcccfb82e4763f0a116c30d71
Branches Tags
hostsharing:master
hostsharing:TP-202311-vhost-bookworm
hostsharing:rel_4.0
hostsharing:ipv6
hostsharing:BackupMXForExternalMX-Removal
hostsharing:refact-openejb
hostsharing:refact-processors
hostsharing:prod
hostsharing:v4.0.18
hostsharing:v4.0.15
hostsharing:v4.0.14
hostsharing:v4.0.13
hostsharing:v4.0.12

No commits in common. "13316d265ef484a9e0cb7a8693a2430fd4c6d416" and "643b23ad34abd94fcccfb82e4763f0a116c30d71" have entirely different histories.
13316d265e ... 643b23ad34

2 changed files with 5 additions and 35 deletions
Show Stats Expand all files Collapse all files

32
hsarback/src/test/java/de/hsadmin/remote/DomainTest.java
View File

@ -135,13 +135,6 @@ public class DomainTest {
Map<?, ?> row = (Map<?, ?>) o;
assertTrue("Domain name should be exampleupdate.de but is " + row.get("name"), "exampleupdate.de".equals(row.get("name")));
assertTrue("ValidSubdomainNames should be * but is " + row.get("validsubdomainnames"), "*".equals(row.get("validsubdomainnames")));
String defaultPassengerPython = "";
assertTrue("PassengerPython should be empty but is " + row.get("passengerpython"), isNullOrEmpty(row.get("passengerpython")));
assertTrue("PassengerNodejs should be empty but is " + row.get("passengernodejs"), isNullOrEmpty(row.get("passengernodejs")));
assertTrue("PassengerRuby should be empty but is " + row.get("passengerruby"), isNullOrEmpty(row.get("passengerruby")));
assertTrue("FcgiPhpBin should be empty but is " + row.get("fcgiphpbin"), isNullOrEmpty(row.get("fcgiphpbin")));
String[] checkDomainOptions = Arrays.asList((Object[]) row.get("domainoptions")).toArray(new String[0]);
String[] expectedDomainOptions = new String[] {"htdocsfallback", "indexes", "dkim", "autoconfig", "greylisting", "includes", "letsencrypt", "multiviews"};
Arrays.sort(expectedDomainOptions);
@ -163,21 +156,10 @@ public class DomainTest {
// now update the domain
setParams = new HashMap<String, Object>();
whereParams = new HashMap<String, String>();
setParams.put("validsubdomainnames", "www2");
String newPassengerPython = "/home/pacs/aaa00/users/admin/.venv/bin/python3";
setParams.put("passengerpython", newPassengerPython);
String newPassengerRuby = "/home/pacs/aaa00/users/admin/.rbenv/shims/ruby";
setParams.put("passengerruby", newPassengerRuby);
String newPassengerNodejs = "/home/pacs/aaa00/users/admin/.nvm/versions/node/v18.19.0/bin/node";
setParams.put("passengernodejs", newPassengerNodejs);
String newFcgiPhpBin = "/usr/bin/php8.1";
setParams.put("fcgiphpbin", newFcgiPhpBin);
String[] newDomainOptions = new String[] {"greylisting", "letsencrypt", "passenger", "passengerfriendlyerrorpages", "cgi", "fastcgi"};
setParams.put("domainoptions", newDomainOptions);
whereParams = new HashMap<String, String>();
whereParams.put("name", "exampleupdate.de");
params = new Object[] { user,
cas.getServiceTicket(grantingTicketURL, RemoteTestHelper.getBackendURL()),
@ -192,12 +174,6 @@ public class DomainTest {
Map<?, ?> row = (Map<?, ?>) o;
assertTrue("Domain name should be exampleupdate.de but is " + row.get("name"), "exampleupdate.de".equals(row.get("name")));
assertTrue("ValidSubdomainNames should be www2 but is " + row.get("validsubdomainnames"), "www2".equals(row.get("validsubdomainnames")));
assertTrue("PassengerPython should be " + newPassengerPython + " but is " + row.get("passengerpython"), newPassengerPython.equals(row.get("passengerpython")));
assertTrue("PassengerNodejs should be " + newPassengerNodejs + " but is " + row.get("passengernodejs"), newPassengerNodejs.equals(row.get("passengernodejs")));
assertTrue("PassengerRuby should be " + newPassengerRuby + " but is " + row.get("passengerruby"), newPassengerRuby.equals(row.get("passengerruby")));
assertTrue("FcgiPhpBin should be " + newFcgiPhpBin + " but is " + row.get("fcgiphpbin"), newFcgiPhpBin.equals(row.get("fcgiphpbin")));
String[] checkDomainOptions = Arrays.asList((Object[]) row.get("domainoptions")).toArray(new String[0]);
Arrays.sort(newDomainOptions);
Arrays.sort(checkDomainOptions);
@ -217,12 +193,6 @@ public class DomainTest {
}
}
private Boolean isNullOrEmpty(Object s) {
if (s == null) return true;
if (((String)s).equals("")) return true;
return false;
}
@Test
public void testCreateForeignSubdomain() throws UnknownHostException, IOException {
int count = getDomsCount();

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

@ -212,7 +212,7 @@ public class Domain extends AbstractEntity {
}
public void setPassengerPython(String value) {
this.passengerpython = value;
passengerpython = value;
}
public String getPassengerNodejs() {
@ -220,7 +220,7 @@ public class Domain extends AbstractEntity {
}
public void setPassengerNodejs(String value) {
this.passengernodejs = value;
passengernodejs = value;
}
public String getPassengerRuby() {
@ -228,7 +228,7 @@ public class Domain extends AbstractEntity {
}
public void setPassengerRuby(String value) {
this.passengerruby = value;
passengerruby = value;
}
public String getFcgiPhpBin() {
@ -236,7 +236,7 @@ public class Domain extends AbstractEntity {
}
public void setFcgiPhpBin(String value) {
this.fcgiphpbin = value;
fcgiphpbin = value;
}
public String getServeraliases() {