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 +1 -65
6 changed files with 1 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 864c21be13 - Show all commits

2
hsarback/database/database_update.sql
View File

@ -93,5 +93,3 @@ ALTER TABLE domain ADD COLUMN passenger_python character varying(255);
ALTER TABLE domain ADD COLUMN passenger_nodejs character varying(255);
ALTER TABLE domain ADD COLUMN passenger_ruby character varying(255);
ALTER TABLE domain ADD COLUMN fcgi_php_bin character varying(255);
ALTER TABLE domain ADD COLUMN proxy_http_port integer;
ALTER TABLE domain ADD COLUMN proxy_websocket_port integer;

4
hsarback/database/schema.sql
View File

@ -323,9 +323,7 @@ CREATE TABLE domain (
passenger_python character varying(256) NULL,
passenger_nodejs character varying(256) NULL,
passenger_ruby character varying(256) NULL,
fcgi_php_bin character varying(256) NULL,
proxy_http_port integer DEFAULT NULL,
proxy_websocket_port integer DEFAULT NULL
fcgi_php_bin character varying(256) NULL
);

12
hsarback/src/main/java/de/hsadmin/remote/DomainRemote.java
View File

@ -59,10 +59,6 @@ public class DomainRemote extends AbstractRemote {
resultMap.put("passengerruby", passengerruby);
final String passengerfcgiphpbin = dom.getPassengerFcgiPhpBin();
resultMap.put("passengerfcgiphpbin", passengerfcgiphpbin);
final String proxyhttpport = dom.getProxyHttpPort();
resultMap.put("proxyhttpport", proxyhttpport);
final String proxywebsocketport = dom.getProxyWebsocketPort();
resultMap.put("proxywebsocketport", proxywebsocketport);
}
@Override
@ -120,14 +116,6 @@ public class DomainRemote extends AbstractRemote {
if (fcgiphpbin != null && fcgiphpbin instanceof String) {
dom.setFcgiPhpBin((String) fcgiphpbin);
}
final Object proxyhttpport = setParams.get("proxyhttpport");
if (proxyhttpport != null && proxyhttpport instanceof Integer) {
dom.setProxyHttpPort((Integer)proxyhttpport);
}
final Object proxywebsocketport = setParams.get("proxywebsocketport");
if (proxywebsocketport != null && proxywebsocketport instanceof Integer) {
dom.setProxyWebsocketPort((Integer)proxywebsocketport);
}
}
@Override

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

@ -125,8 +125,6 @@ public class JsonPillarServlet extends HttpServlet {
final String passengerNodejs = dom.getPassengerNodejs();
final String passengerRuby = dom.getPassengerRuby();
final String fcgiPhpBin = dom.getFcgiPhpBin();
final Integer proxyHttpPort = dom.getProxyHttpPort();
final Integer proxyWebsocketPort = dom.getProxyWebsocketPort();
final INetAddress domINetAddr = domPac.getCurINetAddr();
writer.println(" \"domain\": \"" + domName + "\"");
writer.println(" , \"pac\": \"" + domPac.getName() + "\"");
@ -166,12 +164,6 @@ public class JsonPillarServlet extends HttpServlet {
if (fcgPhpBin.length() > 0) {
writer.println(" , \"fcgiphpbin\": \"" + fcgPhpBin + "\"");
}
if (proxyHttpPort > 0) {
writer.println(" , \"proxyhttpport\": \"" + proxyHttpPort.toString() + "\"");
}
if (proxyWebsocketPort > 0) {
writer.println(" , \"proxywebsocketport\": \"" + proxyWebsocketPort.toString() + "\"");
}
writer.println(" }");
}
writer.println(" ]");

16
hsarback/src/main/resources/de/hsadmin/mods/dom/apache-vhost.vm
View File

@ -181,22 +181,6 @@
#end
#if( ${proxywebsocketport} )
RewriteCond %{REQUEST_FILENAME} !-f
RewriteCond %{HTTP:Connection} Upgrade [NC,OR]
RewriteCond %{HTTP:Upgrade} websocket [NC]
RewriteRule .* ws://127.0.0.1:${proxywebsocketport}/%{REQUEST_URI} [proxy]
#end
#if( ${proxyhttpport} )
RewriteCond %{REQUEST_FILENAME} !-f
RewriteCond %{DOCUMENT_ROOT}/%{REQUEST_FILENAME} !-f
RewriteRule .* http://127.0.0.1:${proxyhttpport}/%{REQUEST_URI} [proxy,last]
RequestHeader set X-Forwarded-Proto "https"
#end
#if( ${fcgiphpbin} )
SetEnv HTTP_PHP_BIN ${fcgiphpbin}
#end

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

@ -82,14 +82,6 @@ public class Domain extends AbstractEntity {
@Column(name = "fcgi_php_bin", columnDefinition = "character varying(256)")
private String fcgiphpbin;
@AnnFieldIO(validation="[0-9]*", rw=ReadWriteAccess.READWRITE)
@Column(name = "proxy_http_port", columnDefinition = "integer")
private Integer proxyhttpport;
@AnnFieldIO(validation="[0-9]*", rw=ReadWriteAccess.READWRITE)
@Column(name = "proxy_websocket_port", columnDefinition = "integer")
private Integer proxywebsocketport;
public Domain() {
}
@ -247,22 +239,6 @@ public class Domain extends AbstractEntity {
fcgiphpbin = value;
}
public Integer getProxyHttpPort() {
return proxyhttpport;
}
public void setProxyHttpPort(String value) {
proxyhttpport = value;
}
public Integer getProxyWebsocketPort() {
return proxywebsocketport;
}
public void setProxyWebsocketPort(String value) {
proxywebsocketport = value;
}
public String getServeraliases() {
String[] subs = validsubdomainnames.split(",");
StringBuffer aliases = new StringBuffer();