HSAdmin Backend Domains, E-Mail, Datenbanken
Peter Hormanns
2015-11-25 74d4bef7862434963635339e63e50fdb7940a321
Merge remote-tracking branch 'origin/sni'
2 files modified
1 files added
17 files deleted
1331 ■■■■■ changed files
hsarback/src/de/hsadmin/mods/dom/DomainProcessorFactory.java 17 ●●●● patch | view | raw | blame | history
hsarback/src/de/hsadmin/mods/dom/apache-vhost.vm 6 ●●●● patch | view | raw | blame | history
hsarback/src/de/hsadmin/mods/dom/openssl-sna.cnf 12 ●●●●● patch | view | raw | blame | history
hsarjcli/.classpath 12 ●●●●● patch | view | raw | blame | history
hsarjcli/.gitignore 2 ●●●●● patch | view | raw | blame | history
hsarjcli/.project 17 ●●●●● patch | view | raw | blame | history
hsarjcli/.settings/org.eclipse.jdt.core.prefs 12 ●●●●● patch | view | raw | blame | history
hsarjcli/build.xml 60 ●●●●● patch | view | raw | blame | history
hsarjcli/scripting/package_dump.js 213 ●●●●● patch | view | raw | blame | history
hsarjcli/src/de/hsadmin/jscli/Main.java 80 ●●●●● patch | view | raw | blame | history
hsarjcli/src/de/hsadmin/jscli/RpcClient.java 92 ●●●●● patch | view | raw | blame | history
hsarjcli/src/de/hsadmin/jscli/ScriptClient.java 127 ●●●●● patch | view | raw | blame | history
hsarjcli/src/de/hsadmin/jscli/cas/CASTicketProvider.java 200 ●●●●● patch | view | raw | blame | history
hsarjcli/src/de/hsadmin/jscli/conf/CommandlineParser.java 72 ●●●●● patch | view | raw | blame | history
hsarjcli/src/de/hsadmin/jscli/conf/Config.java 57 ●●●●● patch | view | raw | blame | history
hsarjcli/src/de/hsadmin/jscli/console/ConsoleWrapper.java 67 ●●●●● patch | view | raw | blame | history
hsarjcli/src/de/hsadmin/jscli/console/PasswordReader.java 9 ●●●●● patch | view | raw | blame | history
hsarjcli/src/de/hsadmin/jscli/exception/JSCliException.java 16 ●●●●● patch | view | raw | blame | history
hsarjcli/src/de/hsadmin/jscli/json/JSONFormatter.java 101 ●●●●● patch | view | raw | blame | history
hsarjcli/src/tools/InstallCert.java 159 ●●●●● patch | view | raw | blame | history
hsarback/src/de/hsadmin/mods/dom/DomainProcessorFactory.java
@@ -269,11 +269,20 @@
        ifOption(templateVars, query, "multiviews", "+MultiViews", "-MultiViews");
        ifOption(templateVars, query, "htdocsfallback", Boolean.TRUE, Boolean.FALSE);
        final Processor domSetupProcessor = new CompoundProcessor(
            new ShellProcessor("export PEMS_DIR=/etc/apache2/pems-enabled/" + dom.getUser().getName() + " && "
                    + "mkdir -p $PEMS_DIR/ && "
            new CreateFileProcessor("/de/hsadmin/mods/dom/openssl-sna.cnf", templateVars, dom, "/tmp/openssl-sna.cnf", "root", "root", "644", true),
            new ShellProcessor("export PEMS_DIR=/etc/apache2/pems-generated && "
                    + "mkdir -p $PEMS_DIR && "
                    + "cd $PEMS_DIR && "
                    + "( ls " + domName + ".crt || ( echo \"\" > " + domName + ".chain && "
                    + "openssl req -x509 -newkey rsa:2048 -keyout " + domName + ".key -out " + domName + ".crt -days 1100 -nodes -sha256 -subj '/CN=" + domName + "' ) ) &&"
                    + "( ls " + domName + ".crt || ( echo \"\" > _." + domName + ".chain && "
                    + "openssl req -x509 -newkey rsa:2048 -keyout _." + domName + ".key -out _." + domName + ".crt -days 1100 -nodes -sha256 -config /tmp/openssl-sna.cnf ) ) &&"
                    + "chmod 400 _." + domName + "*"),
            new ShellProcessor("export PEMS_DIR=/etc/apache2/pems-enabled && "
                    + "mkdir -p $PEMS_DIR && "
                    + "cd $PEMS_DIR && "
                    + "( ls " + domName + ".crt ||"
                    + " ( ln -s ../pems-generated/_." + domName + ".key " + domName + ".key"
                            + " && ln -s ../pems-generated/_." + domName + ".crt " + domName + ".crt"
                            + " && ln -s ../pems-generated/_." + domName + ".chain " + domName + ".chain ) ) && "
                    + "chmod 400 " + domName + "*"),
            new CreateFileProcessor("/de/hsadmin/mods/dom/apache-vhost.vm", templateVars, dom, "/etc/apache2/sites-available/" + domName + ".tmp", "root", "root", "644", true),
            new ShellProcessor(
hsarback/src/de/hsadmin/mods/dom/apache-vhost.vm
@@ -90,9 +90,9 @@
#end    
    SSLEngine On
    SSLCertificateFile /etc/apache2/pems-enabled/${dom.user.name}/${dom.name}.crt
    SSLCertificateKeyFile /etc/apache2/pems-enabled/${dom.user.name}/${dom.name}.key
    SSLCertificateChainFile /etc/apache2/pems-enabled/${dom.user.name}/${dom.name}.chain
    SSLCertificateFile /etc/apache2/pems-enabled/${dom.name}.crt
    SSLCertificateKeyFile /etc/apache2/pems-enabled/${dom.name}.key
    SSLCertificateChainFile /etc/apache2/pems-enabled/${dom.name}.chain
       
    DocumentRoot /home/doms/${dom.name}/htdocs-ssl
hsarback/src/de/hsadmin/mods/dom/openssl-sna.cnf
New file
@@ -0,0 +1,12 @@
[req]
prompt = no
distinguished_name = req_dn
x509_extensions = v3_ca
[req_dn]
commonName = *.${dom.name}
[v3_ca]
basicConstraints = CA:FALSE
extendedKeyUsage=serverAuth
subjectAltName=DNS:*.${dom.name},DNS:${dom.name}
hsarjcli/.classpath
File was deleted
hsarjcli/.gitignore
File was deleted
hsarjcli/.project
File was deleted
hsarjcli/.settings/org.eclipse.jdt.core.prefs
File was deleted
hsarjcli/build.xml
File was deleted
hsarjcli/scripting/package_dump.js
File was deleted
hsarjcli/src/de/hsadmin/jscli/Main.java
File was deleted
hsarjcli/src/de/hsadmin/jscli/RpcClient.java
File was deleted
hsarjcli/src/de/hsadmin/jscli/ScriptClient.java
File was deleted
hsarjcli/src/de/hsadmin/jscli/cas/CASTicketProvider.java
File was deleted
hsarjcli/src/de/hsadmin/jscli/conf/CommandlineParser.java
File was deleted
hsarjcli/src/de/hsadmin/jscli/conf/Config.java
File was deleted
hsarjcli/src/de/hsadmin/jscli/console/ConsoleWrapper.java
File was deleted
hsarjcli/src/de/hsadmin/jscli/console/PasswordReader.java
File was deleted
hsarjcli/src/de/hsadmin/jscli/exception/JSCliException.java
File was deleted
hsarjcli/src/de/hsadmin/jscli/json/JSONFormatter.java
File was deleted
hsarjcli/src/tools/InstallCert.java
File was deleted