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

prepare letsencrypt feature

Browse Source
This commit is contained in:
Peter Hormanns 2017-06-21 20:39:45 +02:00
parent 521807ac7d
commit 3b0e29d5ae
4 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
web/src/main/java/de/hsadmin/web/DomainOptionsEditor.java
View File

@ -16,9 +16,9 @@ import de.hsadmin.rpc.PropertyInfo;
public class DomainOptionsEditor extends CustomComponent implements IHSEditor {
private static final long serialVersionUID = 1L;
private static final long serialVersionUID = 2L;
private static final String[] OPTIONS = new String[] { "greylisting", "multiviews", "indexes", "htdocsfallback", "includes", "backupmxforexternalmx" };
private static final String[] OPTIONS = new String[] { "greylisting", "multiviews", "indexes", "htdocsfallback", "includes", "backupmxforexternalmx", "letsencrypt" };
private final PropertyInfo propertyInfo;
private final VerticalLayout layout;

17
web/src/main/java/de/hsadmin/web/EntryPointsSelector.java
View File

@ -16,6 +16,7 @@ import com.vaadin.ui.TabSheet.SelectedTabChangeEvent;
import com.vaadin.ui.TabSheet.SelectedTabChangeListener;
import com.vaadin.ui.Table;
import de.hsadmin.login.Role;
import de.hsadmin.model.IRemote;
import de.hsadmin.model.TicketService;
import de.hsadmin.rpc.RpcException;
@ -64,12 +65,26 @@ public class EntryPointsSelector extends CustomComponent implements ItemClickLis
final String serviceTicket = ticketService.getServiceTicket(grantingTicket);
try {
final List<Map<String,Object>> list = rolesProxy.search(user, serviceTicket, new HashMap<String, String>());
return (String) list.get(0).get("role");
final String remoteRole = (String) list.get(0).get("role");
return fixRole(remoteRole);
} catch (XmlRpcException e) {
throw new RpcException(e);
}
}
private String fixRole(String remoteRole) {
if ("HOSTMASTER".equals(remoteRole)) {
return Role.SYSTEM.name();
}
if ("PAC_ADMIN_DW".equals(remoteRole)) {
return Role.PACKET.name();
}
if ("DOM_ADMIN".equals(remoteRole)) {
return Role.DOMAIN.name();
}
return remoteRole;
}
@Override
public void itemClick(ItemClickEvent event) {
Table table = (Table) event.getSource();

3
web/src/main/resources/de/hsadmin/web/main.properties
View File

@ -32,12 +32,14 @@ domain.user=Domain User
domain.since=Domain since
domain.dnsMaster=DNS master
domain.domainoptions=Domain options
domain.validsubdomainnames=valid subdomain names
domainoption.greylisting=greylisting
domainoption.multiviews=multiviews
domainoption.indexes=indexes
domainoption.htdocsfallback=htdocsfallback
domainoption.includes=includes
domainoption.backupmxforexternalmx=backupmxforexternalmx
domainoption.letsencrypt=letsencrypt
mysqluser.name=MySql username
mysqluser.instance=MySql instance
mysqluser.pac=MySql package
@ -89,6 +91,7 @@ quota_softlimit=Quota soft limit
quota_hardlimit=Quota hard limit
target=Target
owner=Owner
validsubdomainnames=valid subdomain names
encoding=Encoding
localpart=Local part
subdomain=Subdomain

3
web/src/main/resources/de/hsadmin/web/main_de.properties
View File

@ -32,12 +32,14 @@ domain.user=Domain-Administrator
domain.since=eingerichtet am
domain.dnsMaster=DNS Server
domain.domainoptions=Domain-Optionen
domain.validsubdomainnames=gültige Subdomain (oder * für Wildcard)
domainoption.greylisting=Greylisting
domainoption.multiviews=Multiviews
domainoption.indexes=Indexes
domainoption.htdocsfallback=htdocsfallback
domainoption.includes=Includes
domainoption.backupmxforexternalmx=Backupmx for external MX
domainoption.letsencrypt=Lets Encrypt Zertifikat
mysqluser.name=MySql User
mysqluser.instance=Datenbank-System
mysqluser.pac=Web-Paket
@ -88,6 +90,7 @@ quota_softlimit=Quota (Soft-Limit)
quota_hardlimit=Quota (Hard-Limit)
target=Postfach/Weiterleitung
owner=Domain-Administrator
validsubdomainnames=gültige Subdomain
encoding=Zeichen-Kodierung
localpart=lokaler Teil
subdomain=Subdomain