Commit Graph

385 Commits

Author SHA1 Message Date
peter
95c92273e9 return role "PAC_ADMIN_DW" or "PAC_ADMIN_SW" for webclient 2013-05-01 09:54:28 +02:00
peter
651a2f1c20 prepare 2013-04-30 22:12:52 +02:00
peter
14645dc911 clean or mapping 2013-04-30 22:11:59 +02:00
953938a033 Merge branch 'master' of
ssh://hsh04-source@hsh04.hostsharing.net/home/doms/source.hostsharing.net/source/hsadmin.git
2013-04-30 21:16:34 +02:00
fd53e7dc33 Skip most actions if pac is not a web packet. 2013-04-30 21:15:24 +02:00
9b206322f0 Skip most actions if pac is not a web packet. 2013-04-30 20:32:25 +02:00
Peter Hormanns
ce5c545bef pac migration partial implementation 2013-04-30 18:45:41 +02:00
Peter Hormanns
6ec7999be6 better variable name 2013-04-30 18:44:38 +02:00
Peter Hormanns
8d2214d123 fix db migration 2013-04-30 12:38:16 +02:00
Peter Hormanns
f602b24c13 merge pac-type tests 2013-04-29 20:01:09 +02:00
Peter Hormanns
aa82ca8ad1 custumer property exempt_vat 2013-04-29 12:11:31 +02:00
Peter Hormanns
d1da05fe6d customer properties free vat_indicator 2013-04-29 11:22:02 +02:00
Peter Hormanns
cc95dac6d5 introduce attribute free to pac definition 2013-04-25 13:57:01 +02:00
Peter Hormanns
66c38b36d4 remove todo 2013-04-25 13:18:49 +02:00
Peter Hormanns
9148f924b2 fix error: packet is now created as requested 2013-04-25 12:08:39 +02:00
Peter Hormanns
d61b2a2b35 ignore buggy testcase 2013-04-24 17:50:11 +02:00
Peter Hormanns
51f563d208 enqueue processors only on web packets 2013-04-24 17:30:20 +02:00
peter
9050a0b1b9 init bank account 2013-04-23 22:30:06 +02:00
peter
6a3f5d8ca1 inititalize bank account 2013-04-23 22:27:39 +02:00
Peter Hormanns
f32fd2c6b7 introduce price_list to hsdb 2013-04-18 11:57:16 +02:00
953f0320d2 Exit pac processor factory when processing "unknown" pac types.
Renamed DW/B and SW/B to PAC/DB and PAC/SW.
Introduced new pac type PAC/WEB.
Fixed tests.
2013-04-12 12:56:53 +02:00
Peter Hormanns
d9b68ccaed better name for logging conf property 2013-04-03 15:16:21 +02:00
Peter Hormanns
d4457e3d53 close #102 Logging, Queue 2013-04-03 13:38:50 +02:00
Peter Hormanns
c8984803c7 hostmaster@ as email sender 2013-04-02 19:26:06 +02:00
Peter Hormanns
bdde4368c4 fix #103 Fehlerbehandlung
remove duplicate JDBCProcessor
2013-04-02 18:23:08 +02:00
Purodha
e762eb2145 Merge branch 'master' of ssh://hsh04-source@hsh04.hostsharing.net/home/doms/source.hostsharing.net/source/hsadmin.git 2013-04-02 16:56:29 +01:00
Purodha
325ae31e08 Accept member accounts of more than 3 characters length in "run as"
command.
2013-04-02 16:55:04 +01:00
Peter Hormanns
10e6407a57 use template to generate named.pri-zones 2013-04-02 14:22:15 +02:00
Peter Hormanns
2e99a98acf fix virtual host template 2013-04-02 11:23:56 +02:00
Peter Hormanns
22024d78dd fix template hsh-named.conf 2013-03-07 18:26:36 +01:00
Peter Hormanns
b7a80fa47b fix htaccess template 2013-03-07 18:03:09 +01:00
Peter Hormanns
aee9884aa8 fix error in htaccess template 2013-03-07 16:48:30 +01:00
Peter Hormanns
747bf3ec7b escape parts of template 2013-03-07 16:13:48 +01:00
Peter Hormanns
2543cfcbcc correct vhost template 2013-03-07 14:35:30 +01:00
Peter Hormanns
0e82cbe2ca remove unnecessary WaitingTaskProcessor 2013-03-07 12:23:33 +01:00
Peter Hormanns
e6fb369f88 clean imports 2013-03-06 17:16:24 +01:00
Peter Hormanns
1816c4fc61 annotation for test purpose commented out 2013-03-06 15:48:52 +01:00
Peter Hormanns
ff76f1bf59 pac.delete remove domains before users 2013-03-06 12:39:40 +01:00
Peter Hormanns
6208e0ec8c use velocity template engine 2013-02-20 17:24:23 +01:00
Peter Hormanns
62a66e6859 format code 2013-02-20 17:21:37 +01:00
Purodha
c5c575c095 SelectableValues can now be annotated with kind of data (e.g.
SINGLEVALUE, DOMAINOPTIONS, et al), and these annotations are passed to
remote via moduleprop.search
2013-02-20 16:37:14 +00:00
Purodha
35ebbe6d4f Add more forgotten files, all of the selectableValues context. 2013-02-20 10:46:39 +00:00
Purodha
4a7e129280 Add DomainOptionvalues which was accidentally forgotten last time. 2013-02-20 10:43:13 +00:00
Purodha
24223ea0b7 Another step of handling the annotation of selectableValues. 2013-02-20 10:37:36 +00:00
Peter Hormanns
950ebee553 Write permission to be checked against data base (not against the
intended update)
2013-02-19 15:36:09 +00:00
Peter Hormanns
f8fd8709d5 set correct basepac on pac create 2013-01-28 16:16:23 +01:00
Peter Hormanns
f7416df277 set CascadeType for Domain-Options 2013-01-28 15:58:19 +01:00
Peter Hormanns
e6b213193a fix error in object initialization 2013-01-21 13:42:07 +01:00
Peter Hormanns
932ca07115 clean code 2013-01-21 13:41:41 +01:00
Peter Hormanns
3419f107df fix error in adding new object with hostmaster privileges 2013-01-21 13:41:01 +01:00
Peter Hormanns
6b27737db6 fix error in handling of empty subdomain-property 2013-01-21 13:40:17 +01:00
Peter Hormanns
5056e46610 fix or-mapping of pac-components 2013-01-21 13:38:31 +01:00
Peter Hormanns
75a68d707a allow user.add with given userid, if it is free 2013-01-21 13:37:35 +01:00
Peter Hormanns
9910aeb9e0 on domain add use default domainoptions only if no optins are given 2013-01-21 13:33:19 +01:00
Peter Hormanns
21ae1802e3 code formatting 2013-01-21 13:32:11 +01:00
Purodha
5b55f7a74c Good final test cases commented out. 2013-01-14 11:54:57 +00:00
Purodha
cdc4e12efc moduleprops testing, add test for several referredPros using one source field. 2013-01-05 16:47:48 +00:00
Purodha
9b3192c230 moduleprops now generally working for referredProps, too. Annotations for testing added to Customer. Added qualified field type. 2013-01-05 16:14:34 +00:00
Purodha
c1f04434a0 Some minor fixes in moduleprop, som commented out debugging stuff. Bug null pointer exception when referredProps have indirect fields, i.e. dot notation. 2013-01-03 22:12:52 +00:00
Purodha
f3b725d0d8 Module added: moduleprop - per module list of used fields taken from annotations (begun) 2013-01-03 19:55:19 +00:00
Peter Hormanns
d87cbf7c33 extend FielIO Annotation 2013-01-03 18:31:36 +01:00
Peter Hormanns
44484cce98 remove comments 2012-11-27 13:53:23 +01:00
Peter Hormanns
8b8d7db7e7 inserted linebreak 2012-11-20 14:53:11 +01:00
Peter Hormanns
f60df1baeb use hive-inetaddr instead pf pac-inetaddr in namend-hsh.conf 2012-11-14 11:39:59 +01:00
Peter Hormanns
0f7ee2bf1a fix: set default options for compatibility, allow update on pac-domain 2012-11-13 12:20:13 +01:00
Peter Hormanns
378339e99a quick-fix: problems with 404 in httpd-virtual 2012-11-13 12:19:06 +01:00
d3ceb761a8 Backup MX for External MX affects Postfix transport. 2012-10-31 15:34:49 +01:00
46b6502c2f Manage Postfix relayrecipients on mailin servers. 2012-10-31 14:23:20 +01:00
d0194f9967 Don't create/overwrite files in domain directory hierarchy on update. 2012-10-30 14:09:44 +01:00
abd74a422f Removed: Content migration (packet subdomain) 2012-10-30 13:56:40 +01:00
Peter Hormanns
b92369eea8 vhost templates from michael 2012-10-30 10:46:25 +01:00
Peter Hormanns
a7a0263ed3 aliases in postfix-mailin 2012-10-30 10:43:37 +01:00
Peter Hormanns
d8c5875578 merged templates 2012-10-30 10:40:57 +01:00
Peter Hormanns
47cb523cfb fix pac-domain migration 2012-10-18 17:20:50 +02:00
Peter Hormanns
3a348a1dbb fix pac-domain migration 2012-10-18 17:13:59 +02:00
Peter Hormanns
f2c6ac85a4 fix pac-domain migration 2012-10-18 16:53:50 +02:00
Peter Hormanns
55bae82808 fix pac-domain migration 2012-10-18 16:44:37 +02:00
Peter Hormanns
fd516ce57a fix pac-domain migration 2012-10-18 16:21:44 +02:00
Peter Hormanns
51bb1e19dd support legacy web-client 2012-10-18 13:08:35 +02:00
Peter Hormanns
5b66f03aef clean code 2012-10-16 18:07:19 +02:00
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
e0d77d647b fix error in httpd-virtual.conf 2012-10-16 17:54:14 +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
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
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
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
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
Peter Hormanns
f348545486 overwrite existing link an domain update 2012-09-20 16:32:07 +02:00
Peter Hormanns
8855708fd0 overwrite existing link on domain update 2012-09-20 16:20:01 +02:00
Peter Hormanns
56d3425ad8 mkdir -p because directories exist on domain update 2012-09-20 15:40:42 +02:00
fea9a5a083 Add template file for default virtual host configuration. (refs: #111) 2012-09-20 15:24:04 +02:00
a16c082ba1 Removed obsolete template for welcome message (email) to new pac
admins.
2012-09-20 14:44:35 +02:00
527f2a5869 Some configuration files are managed by HSAdmin and therefore shoudn't
be changed.

Warning:

This file is managed by HSAdmin.
Do not edit manually. Changes will be overwritten.
2012-09-20 14:41:28 +02:00
Peter Hormanns
f0df8fb9a6 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/email/EMailAddressProcessorFactory.java
2012-08-16 18:37:19 +02:00
Peter Hormanns
71af063354 change email configuration 2012-08-16 18:33:23 +02:00
Peter Hormanns
63a31ab23d update and deleteprocessor for domainoptions 2012-08-16 18:15:41 +02:00
06a487819f Moved /etc/postfix/virtual to /etc/postfix-mailin/virtual.
Attention! The static hive configuration needs to be adjusted.
2012-08-16 17:46:59 +02:00
c679a19c03 Use port 225 instead of 25 for smtp transport from mailin servers to
hives.
2012-08-16 17:38:00 +02:00
Peter Hormanns
b9f140d19d Domain createprocessor works with domainoptions 2012-08-16 15:47:20 +02:00
Purodha Blissenbach
a1d97ed10f implement greylisting domain option 2012-08-16 14:43:24 +02:00
Purodha Blissenbach
ee5fbad254 Privileges added: super stupid implememtation allow everyone to to
everything and that cannot be altered.
2012-08-16 12:48:07 +02:00
Peter Hormanns
cf132cf569 revert (GenericAbstractRemote is buggy) 2012-08-16 12:32:39 +02:00
Peter Hormanns
d2dc9e575c allow - in shell 2012-08-16 12:31:26 +02:00
aad18738f3 Das Template unterstützt die Deaktivierung des Fallbacks auf htdocs(-ssl) nicht nicht als Verzeichnis angelegte Subdomains unter subs(-ssl). 2012-08-15 10:54:47 +00:00
fedfa6f6c0 Das Template unterstützt die Deaktivierung des Fallbacks auf htdocs(-ssl) nicht nicht als Verzeichnis angelegte Subdomains unter subs(-ssl). 2012-08-15 10:50:19 +00:00
3611be9661 started generic remote implementation 2012-07-27 16:02:24 +00:00
ba1d525cbe clean code 2012-07-27 12:02:41 +00:00
d596fcbf58 annotate read-write-mode 2012-07-27 10:54:11 +00:00
3d4e839918 clean code 2012-07-27 09:18:08 +00:00
b2d20b80af clean code 2012-07-27 08:43:13 +00:00
081a95257c clean code 2012-07-27 08:41:10 +00:00
7b0315df1f fix NullPointer
greylisting seen more common
2012-07-25 16:24:12 +00:00
3a386fb24e dont delete domainoptions if no new value is given 2012-07-25 15:53:03 +00:00
2171a5cf82 dont delete domainoptions if no new value is given 2012-07-25 15:37:12 +00:00
dcd9f9fbfe enable xmlrpc system modul, hide method getOrderBy 2012-07-23 17:27:35 +00:00
96c2646aac enable xmlrpc system modul, hide method getOrderBy 2012-07-23 16:25:15 +00:00
dcee8e103a enable xmlrpc system modul 2012-07-23 16:15:28 +00:00
01425caf53 fix errors on email-targets as string-arrays 2012-07-19 15:32:54 +00:00
f09b319789 provide option for developer tests without cas and ssl
fix several errors on domainoptions
2012-07-19 14:27:58 +00:00
30941da4d8 DomainUpdateProcessor 2012-07-18 17:00:49 +00:00
7d895c049e define JPA CascadeType 2012-07-18 16:53:44 +00:00