Diese neue Website wurde gerade bei der Hostsharing eG -für {USER_NAME} eingerichtet.
+für ${dom.user.comment} eingerichtet.Der Inhaber der Domain ist bereits per Email unter -webmaster(at){DOMAIN} +webmaster(at)${dom.name} zu erreichen.
- \ No newline at end of file diff --git a/hsarback/src/de/hsadmin/mods/dom/postgrey-whitelist-recipients.jtpl b/hsarback/src/de/hsadmin/mods/dom/postgrey-whitelist-recipients.vm similarity index 63% rename from hsarback/src/de/hsadmin/mods/dom/postgrey-whitelist-recipients.jtpl rename to hsarback/src/de/hsadmin/mods/dom/postgrey-whitelist-recipients.vm index d948b97..7d27cc5 100644 --- a/hsarback/src/de/hsadmin/mods/dom/postgrey-whitelist-recipients.jtpl +++ b/hsarback/src/de/hsadmin/mods/dom/postgrey-whitelist-recipients.vm @@ -1,4 +1,4 @@ -# +# # This file is managed by HSAdmin. # Do not edit manually. Changes will be overwritten. # @@ -8,6 +8,6 @@ postmaster@ #################################################### -{DOM} - - +#foreach( $whitelistdom in ${whitelist} ) +${whitelistdom.name} +#end diff --git a/hsarback/src/de/hsadmin/mods/dom/test.cgi.jtpl b/hsarback/src/de/hsadmin/mods/dom/test.cgi.vm similarity index 52% rename from hsarback/src/de/hsadmin/mods/dom/test.cgi.jtpl rename to hsarback/src/de/hsadmin/mods/dom/test.cgi.vm index cd3dc1b..0f98441 100644 --- a/hsarback/src/de/hsadmin/mods/dom/test.cgi.jtpl +++ b/hsarback/src/de/hsadmin/mods/dom/test.cgi.vm @@ -1,5 +1,4 @@ -#!/bin/sh +#!/bin/sh echo Content-type: text/plain echo echo Hello, world - \ No newline at end of file diff --git a/hsarback/src/de/hsadmin/mods/dom/zonefile.jtpl b/hsarback/src/de/hsadmin/mods/dom/zonefile.jtpl deleted file mode 100644 index b4560a7..0000000 --- a/hsarback/src/de/hsadmin/mods/dom/zonefile.jtpl +++ /dev/null @@ -1,25 +0,0 @@ -$TTL 6H -{DOM_HOSTNAME}. IN SOA dns.hostsharing.net. hostmaster.hostsharing.net. ( - {SIO} ; serial secs since Jan 1 1970 - 6H ; refresh (>=10000) - 1H ; retry (>=1800) - 1W ; expire - 1H ; minimum -) - -{DOM_HOSTNAME}. IN NS dns1.hostsharing.net. -{DOM_HOSTNAME}. IN NS dns2.hostsharing.net. -{DOM_HOSTNAME}. IN NS dns3.hostsharing.net. - -{DOM_HOSTNAME}. IN MX 30 mailin1.hostsharing.net. -{DOM_HOSTNAME}. IN MX 30 mailin2.hostsharing.net. -{DOM_HOSTNAME}. IN MX 30 mailin3.hostsharing.net. - -{DOM_HOSTNAME}. IN A {DOM_IPNUMBER} - -*.{DOM_HOSTNAME}. IN MX 30 mailin1.hostsharing.net. -*.{DOM_HOSTNAME}. IN MX 30 mailin2.hostsharing.net. -*.{DOM_HOSTNAME}. IN MX 30 mailin3.hostsharing.net. - -*.{DOM_HOSTNAME}. IN A {DOM_IPNUMBER} - \ No newline at end of file diff --git a/hsarback/src/de/hsadmin/mods/dom/zonefile.vm b/hsarback/src/de/hsadmin/mods/dom/zonefile.vm new file mode 100644 index 0000000..b25b612 --- /dev/null +++ b/hsarback/src/de/hsadmin/mods/dom/zonefile.vm @@ -0,0 +1,24 @@ +$TTL 6H +${dom.name}. IN SOA dns.hostsharing.net. hostmaster.hostsharing.net. ( + ${sio} ; serial secs since Jan 1 1970 + 6H ; refresh (>=10000) + 1H ; retry (>=1800) + 1W ; expire + 1H ; minimum +) + +${dom.name}. IN NS dns1.hostsharing.net. +${dom.name}. IN NS dns2.hostsharing.net. +${dom.name}. IN NS dns3.hostsharing.net. + +${dom.name}. IN MX 30 mailin1.hostsharing.net. +${dom.name}. IN MX 30 mailin2.hostsharing.net. +${dom.name}. IN MX 30 mailin3.hostsharing.net. + +${dom.name}. IN A ${pac.curINetAddr.inetAddr} + +*.${dom.name}. IN MX 30 mailin1.hostsharing.net. +*.${dom.name}. IN MX 30 mailin2.hostsharing.net. +*.${dom.name}. IN MX 30 mailin3.hostsharing.net. + +*.${dom.name}. IN A ${pac.curINetAddr.inetAddr} diff --git a/hsarback/src/de/hsadmin/mods/pac/BasePac.java b/hsarback/src/de/hsadmin/mods/pac/BasePac.java index 2698b4b..7f43695 100644 --- a/hsarback/src/de/hsadmin/mods/pac/BasePac.java +++ b/hsarback/src/de/hsadmin/mods/pac/BasePac.java @@ -26,6 +26,7 @@ public class BasePac implements Serializable { private static final long serialVersionUID = 1491121619195513435L; public BasePac() { + components = new HashSet
- * Template syntax:
- * Variables:
- * {VARIABLE_NAME}
- * Blocks:
- * <!-- BEGIN: BlockName -->
- * <!-- BEGIN: SubBlockName -->
- * <!-- END: SubBlockName -->
- * <!-- END: BlockName -->
- *
- * License: Apache 2.0
-*/
-
-public class Jtpl implements Serializable
-{
- private static final long serialVersionUID = -7175035307912229580L;
-
- private HashMapfile name of the template, exemple: "java/folder/index.tpl"
- * @throws IOException when an i/o error occurs while reading the template.
- */
- public Jtpl(String fileName) throws IOException
- {
- this(new File(fileName));
- // this is the old constructor so it enables the old (pre-1.3) behavior on errors
- this.failSilently = true;
- }
-
- /**
- * Constructs a Jtpl object and reads the template from a file.
- * @param file readable file containing template source
- * @throws IOException when an i/o error occurs while reading the template.
- */
- public Jtpl(File file) throws IOException
- {
- FileReader fr = new FileReader(file);
- String fileText = readFile(fr);
- makeTree(fileText);
- }
-
- /**
- * Constructs a Jtpl object and reads the template from arbitrary input source.
- * @param template the template source
- * @throws IOException when an i/o error occurs while reading the template.
- */
- public Jtpl(Reader template) throws IOException
- {
- String fileText = readFile(template);
- makeTree(fileText);
- }
-
- /**
- * Assign a template variable.
- * For variables that are used in blocks, the variable value
- * must be set before parse is called.
- * @param varName the name of the variable to be set.
- * @param varData the new value of the variable.
- */
- public void assign(String varName, String varData)
- {
- vars.put(varName, varData);
- }
-
- /**
- * Generates the HTML page and return it into a String.
- */
- public String out()
- {
- if (this.implicitMain) {
- this.parse("main");
- }
- Object main = parsedBlocks.get("main");
- if (main == null) {
- throw new IllegalStateException("'main' block not parsed");
- }
- return(main.toString());
- }
-
- /**
- * Parse a template block.
- * If the block contains variables, these variables must be set
- * before the block is added.
- * If the block contains subblocks, the subblocks
- * must be parsed before this block.
- * @param blockName the name of the block to be parsed.
- * @throws IllegalArgumentException if the block name is not found (and failSiletly==false)
- */
- public void parse(String blockName) throws IllegalArgumentException
- {
- String copy = "";
- if (implicitMain && !"main".equals(blockName) && !blockName.startsWith("main.")) {
- blockName = "main." + blockName;
- }
- try {
- copy = blocks.get(blockName).toString();
- } catch (NullPointerException e) {
- if (!this.failSilently) throw new IllegalArgumentException(
- "Block '" + blockName + "' not found." +
- " Matches " + locateBlock(blockName));
- }
- Pattern pattern = Pattern.compile("\\{([\\w\\.]+)\\}");
- Matcher matcher = pattern.matcher(copy);
- pattern = Pattern.compile("_BLOCK_\\.(.+)");
- for (Matcher matcher2; matcher.find();)
- {
- String match = matcher.group(1);
- matcher2 = pattern.matcher(match);
- if (matcher2.find())
- {
- if (parsedBlocks.containsKey(matcher2.group(1)))
- {
- copy = copy.replaceFirst("\\{"+match+"\\}", escape(
- parsedBlocks.get(matcher2.group(1)).toString()));
- }
- else
- {
- copy = copy.replaceFirst("\\{"+match+"\\}", "");
- }
- }
- else
- {
- if (vars.containsKey(match))
- {
- copy = copy.replaceFirst("\\{"+match+"\\}", escape(
- vars.get(match).toString()));
- }
- else
- {
- // Leave unchanged because it might be wanted in output.
- // Can always be removed by assigning empty value.
- //copy = copy.replaceFirst("\\{"+match+"\\}", "");
- }
- }
- }
- if (parsedBlocks.containsKey(blockName))
- {
- parsedBlocks.put(blockName, parsedBlocks.get(blockName) + copy);
- }
- else
- {
- parsedBlocks.put(blockName, copy);
- }
- if (subBlocks.containsKey(blockName))
- {
- parsedBlocks.put(subBlocks.get(blockName), "");
- }
- }
-
- /**
- * Template parsing uses regex replace to insert result text,
- * which means that special characters in replacement string must be escaped.
- * @param replacement The text that should appear in output.
- * @return Text escaped so that it works as String.replaceFirst replacement.
- */
- protected String escape(String replacement) {
- return replacement.replace("\\", "\\\\").replace("$", "\\$");
- }
-
- /**
- * Lists the blocks that end with the given blockName.
- * @param blockName The name as used in parse
- * @return Blocks where blockName is the child
- * (the Set's toString lists the full names)
- */
- protected Set