remove code from email to pac-admin

This commit is contained in:
Peter Hormanns 2012-09-20 19:14:53 +02:00
parent 7358d24835
commit 564d2807b7

View File

@ -29,13 +29,11 @@ public class PacProcessorFactory implements EntityProcessorFactory {
EntityManager em, T entity) throws ProcessorException { EntityManager em, T entity) throws ProcessorException {
Pac pac = (Pac) entity; Pac pac = (Pac) entity;
String pacName = pac.getName(); String pacName = pac.getName();
// String customerEMail = pac.getCustomer().getContractualContact().getEmail();
Hive hive = pac.getHive(); Hive hive = pac.getHive();
UnixUser unixUser = getPacAdminUser(pac); UnixUser unixUser = getPacAdminUser(pac);
String password = PasswordTool.generatePassword(); String password = PasswordTool.generatePassword();
Map<String, String> hiveValues = fillHiveValues(hive); Map<String, String> hiveValues = fillHiveValues(hive);
List<Map<String, String>> pacValuesList = fillPacValuesList(hive, null); List<Map<String, String>> pacValuesList = fillPacValuesList(hive, null);
// Map<String, String> emailVars = fillEMailValues(pacName, customerEMail, password);
Processor priProcessor = new CompoundProcessor( Processor priProcessor = new CompoundProcessor(
createAddUserProc(pacName, unixUser, password), createAddUserProc(pacName, unixUser, password),
createSetQuotaProc(pac), createSetQuotaProc(pac),
@ -48,7 +46,6 @@ public class PacProcessorFactory implements EntityProcessorFactory {
createIfUp(pacName), createIfUp(pacName),
createHttpdVirtualProc(pacName, pacValuesList)); createHttpdVirtualProc(pacName, pacValuesList));
WaitingTasksProcessor secProcessor = new WaitingTasksProcessor(priProcessor); WaitingTasksProcessor secProcessor = new WaitingTasksProcessor(priProcessor);
// secProcessor.appendProcessor(pac.getHiveName(), createSendEMailProc(pacName, customerEMail, emailVars), "send email to customer");
return secProcessor; return secProcessor;
} }
@ -168,16 +165,6 @@ public class PacProcessorFactory implements EntityProcessorFactory {
); );
} }
// private Processor createSendEMailProc(String pacName,
// String customerEMail, Map<String, String> emailVars) throws ProcessorException {
// return new MailerProcessor(
// customerEMail,
// "Zugangsdaten des neue Hostsharing Pakets " + pacName,
// "/de/hsadmin/mods/pac/email_new_pac_account.jtpl",
// emailVars
// );
// }
private Processor createIfUp(String pacName) { private Processor createIfUp(String pacName) {
return new ShellProcessor("ifup eth0:" + pacName); return new ShellProcessor("ifup eth0:" + pacName);
} }
@ -224,13 +211,4 @@ public class PacProcessorFactory implements EntityProcessorFactory {
return pacValuesList; return pacValuesList;
} }
// private Map<String, String> fillEMailValues(String pacName,
// String customerEMail, String password) {
// Map<String, String> emailVars = new HashMap<String, String>();
// emailVars.put("PAC", pacName);
// emailVars.put("PASSWORD", password);
// emailVars.put("CUST_EMAIL", customerEMail);
// return emailVars;
// }
} }