Commit Graph

772 Commits

Author SHA1 Message Date
Peter Hormanns
82dfbe844c Merge branch 'master' of
ssh://hsh04-source@hsh04.hostsharing.net/home/doms/source.hostsharing.net/source/hsadmin.git
2012-10-16 18:04:44 +02:00
Peter Hormanns
707e57a482 Merge branch 'master' of
ssh://hsh04-source@hsh04.hostsharing.net/home/doms/source.hostsharing.net/source/hsadmin.git
2012-10-16 17:56:41 +02:00
Peter Hormanns
7778b3941a Merge branch 'master' of ssh://hsh04-source@hsh04.hostsharing.net/home/doms/source.hostsharing.net/source/hsadmin.git 2012-10-16 17:56:04 +02:00
Peter Hormanns
e0d77d647b fix error in httpd-virtual.conf 2012-10-16 17:54:14 +02:00
Peter Hormanns
30a40d88f5 fix error in httpd-virtual.conf 2012-10-16 17:44:26 +02:00
Peter Hormanns
fc0573874b fix error in virtual.conf 2012-10-16 17:42:19 +02:00
Peter Hormanns
787a086baf fix errors in virtual.conf 2012-10-16 17:35:14 +02:00
Peter Hormanns
d5b27e5a59 correct cert-chain in vortual.conf 2012-10-16 17:11:10 +02:00
Peter Hormanns
fbbb1f4132 error in update of file virtual.conf corrected 2012-10-16 15:39:55 +02:00
peter
c1ac39ec78 handling of created and cancelled properties 2012-10-16 10:54:36 +02:00
Purodha Blissenbach
984d169e2c Correctinos and enhancements for domain options testing via sockets. 2012-10-02 16:44:36 +02:00
Peter Hormanns
d3c62505b3 fix dependency servlet.jar 2012-09-21 19:35:01 +02:00
Peter Hormanns
02d4a5ea8f serialize map-values for table view 2012-09-21 18:56:07 +02:00
Purodha Blissenbach
b3142cfbb9 Meaning inverted for domain options includes, indexes, and multiviews. 2012-09-21 18:22:26 +02:00
Peter Hormanns
0f3f06780e correct JPQL on select greylisting domains 2012-09-21 17:47:10 +02:00
Peter Hormanns
ec62249fb8 revert domain selection with postgrey domainoption 2012-09-21 17:39:25 +02:00
Peter Hormanns
f33c40fad7 format source 2012-09-21 17:31:58 +02:00
Peter Hormanns
3cf661b0d6 dont delete domainoption an domain.delete 2012-09-21 17:08:42 +02:00
Peter Hormanns
96675a06eb fix problem detached domainoption 2012-09-21 16:48:49 +02:00
Peter Hormanns
a5527411d8 set domain admin before persisting domain 2012-09-21 16:37:13 +02:00
Peter Hormanns
b44aab8d2d attach domain before setting reference to attached domainoption 2012-09-21 16:31:44 +02:00
Peter Hormanns
5a46f47d37 fixed missing parenthesis 2012-09-21 16:21:33 +02:00
Peter Hormanns
3f23cec1c2 Merge branch 'master' of ssh://hsh04-source@hsh04.hostsharing.net/home/doms/source.hostsharing.net/source/hsadmin.git/ 2012-09-21 16:19:03 +02:00
Peter Hormanns
6c1765c478 nothing changed 2012-09-21 16:18:50 +02:00
Purodha Blissenbach
001946a6d0 Fix fatal error setting default domain options for newly created domain. 2012-09-21 16:16:55 +02:00
Purodha Blissenbach
6bda687298 Merge branch 'master' of ssh://hsh04-source@hsh04.hostsharing.net/home/doms/source.hostsharing.net/source/hsadmin.git 2012-09-21 15:18:30 +02:00
Purodha Blissenbach
e0ee6fe431 values of where-paremeters named "id" are now treated as numbers when
reading from command line client. This is a guess-based trial.
2012-09-21 15:18:17 +02:00
be606b0e1f Merge remote-tracking branch 'origin/master' 2012-09-21 14:59:11 +02:00
48c8d27773 Fixed migration code: pac domain to subdomain 2012-09-21 14:58:36 +02:00
Purodha Blissenbach
7be61f856c Default domain options for newly created domain - greylisting on,
anything else not set.
2012-09-21 14:30:03 +02:00
Peter Hormanns
bb23e27f6e Merge branch 'master' of ssh://hsh04-source@hsh04.hostsharing.net/home/doms/source.hostsharing.net/source/hsadmin.git/ 2012-09-21 14:16:41 +02:00
Peter Hormanns
da5f5cd6fb implement pac update 2012-09-21 14:16:22 +02:00
Purodha Blissenbach
cadd25346c Merge branch 'master' of ssh://hsh04-source@hsh04.hostsharing.net/home/doms/source.hostsharing.net/source/hsadmin.git 2012-09-21 13:51:14 +02:00
Purodha Blissenbach
b127d65e62 Database migration to version 2.2 begun. 2012-09-21 13:50:45 +02:00
e33737aaf6 Refactoring deletion of email addresses as part of the domain deletion
process.
2012-09-21 13:37:18 +02:00
9f568eef06 Implemented domain options: Apache vhost. 2012-09-21 12:46:54 +02:00
Purodha Blissenbach
ac49567fb4 Badd test basics for domainoptions backupmxforexternalmx, indexes,
inclides, multiviews, not yet doing anything useful, currently disabled.
2012-09-21 11:29:18 +02:00
Purodha Blissenbach
1dd78a708d tests universalized 2012-09-20 20:27:17 +02:00
Purodha Blissenbach
502ff83910 Merge branch 'master' of ssh://hsh04-source@hsh04.hostsharing.net/home/doms/source.hostsharing.net/source/hsadmin.git 2012-09-20 20:25:17 +02:00
Purodha Blissenbach
ea42d6fedb More domainoptions preemptively preset in data base, existing options
renmend ( no no-), tests universalized.
2012-09-20 20:24:55 +02:00
Peter Hormanns
2b5e94e765 Merge branch 'master' of ssh://hsh04-source@hsh04.hostsharing.net/home/doms/source.hostsharing.net/source/hsadmin.git/ 2012-09-20 19:15:49 +02:00
Peter Hormanns
564d2807b7 remove code from email to pac-admin 2012-09-20 19:14:53 +02:00
968560db41 Virtual Host Templates:
ServerAdmin webmaster@<domain>
cgi+fastcgi: Location => Directory
2012-09-20 18:50:00 +02:00
58b9c96c76 Whitespace 2012-09-20 18:16:40 +02:00
c1ecf8794a pac.add: Create .bak directory, refresh traffic accounting rules
pac.delete: Refresh traffic accounting rules
2012-09-20 18:16:25 +02:00
Peter Hormanns
7358d24835 Merge branch 'master' of
ssh://hsh04-source@hsh04.hostsharing.net/home/doms/source.hostsharing.net/source/hsadmin.git/

Conflicts:
	hsarback/src/de/hsadmin/mods/dom/DomainProcessorFactory.java
	hsarback/src/de/hsadmin/mods/pac/PacProcessorFactory.java
2012-09-20 17:30:00 +02:00
Peter Hormanns
400c14a23e merged 2012-09-20 17:21:04 +02:00
796799bc63 Merge branch 'master' of ssh://hsh04-source@hsh04.hostsharing.net/home/doms/source.hostsharing.net/source/hsadmin.git 2012-09-20 17:13:30 +02:00
9a219290a4 (Re)generate /etc/apache2/virtual.conf on pac.add and pac.delete. 2012-09-20 17:12:52 +02:00
Purodha Blissenbach
e7fe65460a Merge branch 'master' of ssh://hsh04-source@hsh04.hostsharing.net/home/doms/source.hostsharing.net/source/hsadmin.git 2012-09-20 17:10:41 +02:00