prepare letsencrypt feature
This commit is contained in:
parent
da37fd8832
commit
8a36ca7901
@ -16,9 +16,9 @@ import de.hsadmin.rpc.PropertyInfo;
|
|||||||
|
|
||||||
public class DomainOptionsEditor extends CustomComponent implements IHSEditor {
|
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 PropertyInfo propertyInfo;
|
||||||
private final VerticalLayout layout;
|
private final VerticalLayout layout;
|
||||||
|
@ -16,6 +16,7 @@ import com.vaadin.ui.TabSheet.SelectedTabChangeEvent;
|
|||||||
import com.vaadin.ui.TabSheet.SelectedTabChangeListener;
|
import com.vaadin.ui.TabSheet.SelectedTabChangeListener;
|
||||||
import com.vaadin.ui.Table;
|
import com.vaadin.ui.Table;
|
||||||
|
|
||||||
|
import de.hsadmin.login.Role;
|
||||||
import de.hsadmin.model.IRemote;
|
import de.hsadmin.model.IRemote;
|
||||||
import de.hsadmin.model.TicketService;
|
import de.hsadmin.model.TicketService;
|
||||||
import de.hsadmin.rpc.RpcException;
|
import de.hsadmin.rpc.RpcException;
|
||||||
@ -64,12 +65,26 @@ public class EntryPointsSelector extends CustomComponent implements ItemClickLis
|
|||||||
final String serviceTicket = ticketService.getServiceTicket(grantingTicket);
|
final String serviceTicket = ticketService.getServiceTicket(grantingTicket);
|
||||||
try {
|
try {
|
||||||
final List<Map<String,Object>> list = rolesProxy.search(user, serviceTicket, new HashMap<String, String>());
|
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) {
|
} catch (XmlRpcException e) {
|
||||||
throw new RpcException(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
|
@Override
|
||||||
public void itemClick(ItemClickEvent event) {
|
public void itemClick(ItemClickEvent event) {
|
||||||
Table table = (Table) event.getSource();
|
Table table = (Table) event.getSource();
|
||||||
|
@ -32,12 +32,14 @@ domain.user=Domain User
|
|||||||
domain.since=Domain since
|
domain.since=Domain since
|
||||||
domain.dnsMaster=DNS master
|
domain.dnsMaster=DNS master
|
||||||
domain.domainoptions=Domain options
|
domain.domainoptions=Domain options
|
||||||
|
domain.validsubdomainnames=valid subdomain names
|
||||||
domainoption.greylisting=greylisting
|
domainoption.greylisting=greylisting
|
||||||
domainoption.multiviews=multiviews
|
domainoption.multiviews=multiviews
|
||||||
domainoption.indexes=indexes
|
domainoption.indexes=indexes
|
||||||
domainoption.htdocsfallback=htdocsfallback
|
domainoption.htdocsfallback=htdocsfallback
|
||||||
domainoption.includes=includes
|
domainoption.includes=includes
|
||||||
domainoption.backupmxforexternalmx=backupmxforexternalmx
|
domainoption.backupmxforexternalmx=backupmxforexternalmx
|
||||||
|
domainoption.letsencrypt=letsencrypt
|
||||||
mysqluser.name=MySql username
|
mysqluser.name=MySql username
|
||||||
mysqluser.instance=MySql instance
|
mysqluser.instance=MySql instance
|
||||||
mysqluser.pac=MySql package
|
mysqluser.pac=MySql package
|
||||||
@ -89,6 +91,7 @@ quota_softlimit=Quota soft limit
|
|||||||
quota_hardlimit=Quota hard limit
|
quota_hardlimit=Quota hard limit
|
||||||
target=Target
|
target=Target
|
||||||
owner=Owner
|
owner=Owner
|
||||||
|
validsubdomainnames=valid subdomain names
|
||||||
encoding=Encoding
|
encoding=Encoding
|
||||||
localpart=Local part
|
localpart=Local part
|
||||||
subdomain=Subdomain
|
subdomain=Subdomain
|
||||||
|
@ -32,12 +32,14 @@ domain.user=Domain-Administrator
|
|||||||
domain.since=eingerichtet am
|
domain.since=eingerichtet am
|
||||||
domain.dnsMaster=DNS Server
|
domain.dnsMaster=DNS Server
|
||||||
domain.domainoptions=Domain-Optionen
|
domain.domainoptions=Domain-Optionen
|
||||||
|
domain.validsubdomainnames=gültige Subdomain (oder * für Wildcard)
|
||||||
domainoption.greylisting=Greylisting
|
domainoption.greylisting=Greylisting
|
||||||
domainoption.multiviews=Multiviews
|
domainoption.multiviews=Multiviews
|
||||||
domainoption.indexes=Indexes
|
domainoption.indexes=Indexes
|
||||||
domainoption.htdocsfallback=htdocsfallback
|
domainoption.htdocsfallback=htdocsfallback
|
||||||
domainoption.includes=Includes
|
domainoption.includes=Includes
|
||||||
domainoption.backupmxforexternalmx=Backupmx for external MX
|
domainoption.backupmxforexternalmx=Backupmx for external MX
|
||||||
|
domainoption.letsencrypt=Lets Encrypt Zertifikat
|
||||||
mysqluser.name=MySql User
|
mysqluser.name=MySql User
|
||||||
mysqluser.instance=Datenbank-System
|
mysqluser.instance=Datenbank-System
|
||||||
mysqluser.pac=Web-Paket
|
mysqluser.pac=Web-Paket
|
||||||
@ -88,6 +90,7 @@ quota_softlimit=Quota (Soft-Limit)
|
|||||||
quota_hardlimit=Quota (Hard-Limit)
|
quota_hardlimit=Quota (Hard-Limit)
|
||||||
target=Postfach/Weiterleitung
|
target=Postfach/Weiterleitung
|
||||||
owner=Domain-Administrator
|
owner=Domain-Administrator
|
||||||
|
validsubdomainnames=gültige Subdomain
|
||||||
encoding=Zeichen-Kodierung
|
encoding=Zeichen-Kodierung
|
||||||
localpart=lokaler Teil
|
localpart=lokaler Teil
|
||||||
subdomain=Subdomain
|
subdomain=Subdomain
|
||||||
|
Loading…
Reference in New Issue
Block a user