error in update of file virtual.conf corrected

Peter Hormanns

2012-10-16 fbbb1f4132027231d0d1bc9f29b879550daddca7

error in update of file virtual.conf corrected

 hsarback/src/de/hsadmin/mods/pac/PacModuleImpl.java

@@ -113,10 +113,10 @@
    public AbstractEntity update(AbstractEntity entity)
            throws HSAdminException {
        UnixUser loginUser = getTransaction().getLoginUser();
        if (entity instanceof Pac) {
            Pac pac = (Pac) entity;
        } else {
        if (!(entity instanceof Pac)) {
            throw new AuthorisationException(loginUser, "update", entity);
//        } else {
//            Pac pac = (Pac) entity;
        }
        needsWriteAccessOn(entity, "update");
        return super.update(entity);

 hsarback/src/de/hsadmin/mods/pac/PacProcessorFactory.java

@@ -57,14 +57,17 @@
    private Processor createHttpdVirtualProc(
            String pacName, List<Map<String, String>> pacValuesList) throws ProcessorException {
        Processor domSetupProcessor = new CompoundProcessor(
                new CreateFileProcessor("/de/hsadmin/mods/pac/httpd-virtual.jtpl", new HashMap<String, String>(), pacValuesList.iterator(), "/etc/apache2/virtual.conf.tmp", "root", "root", "644", true),
                new CreateFileProcessor("/de/hsadmin/mods/pac/httpd-virtual.jtpl", 
                        new HashMap<String, String>(), pacValuesList.iterator(), 
                        "/etc/apache2/virtual.conf.tmp", "root", "root", "644", true),
                new ShellProcessor("ls /etc/apache2/pems/" + pacName + ".pem >/dev/null 2>&1 " + "&& sed -i '/SSLCertificate.*default/d' " + "/etc/apache2/apache.conf.tmp"
                                + " && (ls /etc/apache2/pems/" + pacName + ".chain.pem >/dev/null 2>&1"
                                + " || sed -i '/SSLCertificateChain.*" + pacName + "/d' " + "/etc/apache2/virtual.conf.tmp)"
                                + " || sed -i '/SSLCertificate.*" + pacName + "/d' " + "/etc/apache2/virtual.conf.tmp"),
                new ShellProcessor("(diff -q /etc/apache2/apache.conf.tmp /etc/apache2/apache.conf"
                                + " && rm /etc/apache2/apache.conf.tmp)"
                                + " || invoke-rc.d apache2 reload >/dev/null 2>&1"));
                new ShellProcessor("(diff -q /etc/apache2/virtual.conf.tmp /etc/apache2/virtual.conf"
                                + " && rm /etc/apache2/virtual.conf.tmp )"
                                + " || ( mv /etc/apache2/virtual.conf.tmp /etc/apache2/virtual.conf " 
                                + " && invoke-rc.d apache2 reload >/dev/null 2>&1 ) "));
        return domSetupProcessor;
    }