ispman/install-data/templates acl.vhost.ldif.template,1.6,1.6.10.1 aclid.counter.ldif.template,1.1,1.1.26.1 client.ldif.template,1.3,1.3.6.1 domain.common.ldif.template,1.9,1.9.2.1 domain.dnszone.ldif.template,1.20,1.20.4.1 domain.extended.ldif.template,1.13,1.13.2.1 domain.httpusers.ldif.template,1.5,1.5.10.1 domain.posixGroup.ldif.template,1.1,1.1.2.1 domain.rfc822MailGroup.ldif.template,1.5,1.5.12.1 redirections.vhost.ldif.template,1.5,1.5.10.1 reseller.ldif.template,1.2,1.2.10.1 users.ldif.template,1.15,1.15.4.1 vhost.ldif.template,1.10,1.10.2.1
Joerg Delker <[email protected]>
| Newsgroups | gmane.comp.isp.ispman.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/ispman/ispman/install-data/templates
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29520/install-data/templates
Modified Files:
Tag: dev_1_3-bigcleanup
acl.vhost.ldif.template aclid.counter.ldif.template
client.ldif.template domain.common.ldif.template
domain.dnszone.ldif.template domain.extended.ldif.template
domain.httpusers.ldif.template domain.posixGroup.ldif.template
domain.rfc822MailGroup.ldif.template
redirections.vhost.ldif.template reseller.ldif.template
users.ldif.template vhost.ldif.template
Log Message:
first cleanup changes
aims:
- have nice, clean, independant Config.pm to manage *all* ISPMan configs
- remove "name space pollution" (with using objects more strictly there is no need to export everything, code is better readable/understandable)
- separating libs for backend and UI
Index: client.ldif.template
===================================================================
RCS file: /cvsroot/ispman/ispman/install-data/templates/client.ldif.template,v
retrieving revision 1.3
retrieving revision 1.3.6.1
diff -u -d -r1.3 -r1.3.6.1
--- client.ldif.template 8 Jan 2004 00:01:03 -0000 1.3
+++ client.ldif.template 10 Aug 2004 20:54:30 -0000 1.3.6.1
@@ -1,4 +1,4 @@
-dn: ispmanClientId=<perl>$r->param("ispmanClientId")</perl>,ispmanResellerId=<perl>$r->param("ispmanResellerId")</perl>, ou=ispman, <perl>$ispman->getConf("ldapBaseDN")</perl>
+dn: ispmanClientId=<perl>$r->param("ispmanClientId")</perl>,ispmanResellerId=<perl>$r->param("ispmanResellerId")</perl>, ou=ispman, <perl>ISPMan::Config->get("ldapBaseDN")</perl>
objectclass: ispmanClient
ispmanCreateTimestamp: <perl>time()</perl>
ispmanStatus: active
Index: redirections.vhost.ldif.template
===================================================================
RCS file: /cvsroot/ispman/ispman/install-data/templates/redirections.vhost.ldif.template,v
retrieving revision 1.5
retrieving revision 1.5.10.1
diff -u -d -r1.5 -r1.5.10.1
--- redirections.vhost.ldif.template 26 Apr 2003 19:21:45 -0000 1.5
+++ redirections.vhost.ldif.template 10 Aug 2004 20:54:30 -0000 1.5.10.1
@@ -1,4 +1,4 @@
-dn: ispmanVhostRedirectURL=<perl>$r->param("ispmanVhostRedirectURL")</perl>,ou=urlRedirections,ispmanVhostName=<perl>$r->param("ispmanVhostName")</perl>,ou=httpdata,ispmanDomain=<perl>$r->param("ispmanDomain")</perl>,<perl>$ispman->getConf("ldapBaseDN")</perl>
+dn: ispmanVhostRedirectURL=<perl>$r->param("ispmanVhostRedirectURL")</perl>,ou=urlRedirections,ispmanVhostName=<perl>$r->param("ispmanVhostName")</perl>,ou=httpdata,ispmanDomain=<perl>$r->param("ispmanDomain")</perl>,<perl>ISPMan::Config->get("ldapBaseDN")</perl>
ispmanVhostRedirectURL: <perl>$r->param("ispmanVhostRedirectURL")</perl>
ispmanVhostRedirectLocation: <perl>$r->param("ispmanVhostRedirectLocation")</perl>
ispmanVhostName: <perl>$r->param("ispmanVhostName")</perl>
Index: domain.common.ldif.template
===================================================================
RCS file: /cvsroot/ispman/ispman/install-data/templates/domain.common.ldif.template,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -u -d -r1.9 -r1.9.2.1
--- domain.common.ldif.template 26 Jun 2004 22:42:35 -0000 1.9
+++ domain.common.ldif.template 10 Aug 2004 20:54:30 -0000 1.9.2.1
@@ -1,4 +1,4 @@
-dn: ispmanDomain=<perl>$domain</perl>, <perl>$ispman->getConf("ldapBaseDN")</perl>
+dn: ispmanDomain=<perl>$domain</perl>, <perl>ISPMan::Config->get("ldapBaseDN")</perl>
objectclass: ispmanDomain
ispmanStatus: active
ispmanCreateTimestamp: <perl>time()</perl>
@@ -18,10 +18,10 @@
<perl>
#If there is a site specific file load and evaluate it
-$templatesDir= join "/", ($ispman->getConf("installDir"), 'templates');
+$templatesDir= join "/", (ISPMan::Config->get("installDir"), 'templates');
unless (-d $templatesDir){
# For developers
- $templatesDir= join "/", ($ispman->getConf("installDir"), 'install-data/templates');
+ $templatesDir= join "/", (ISPMan::Config->get("installDir"), 'install-data/templates');
#print "Dev version? Found templates in $templatesDir\n<br>";
}
Index: acl.vhost.ldif.template
===================================================================
RCS file: /cvsroot/ispman/ispman/install-data/templates/acl.vhost.ldif.template,v
retrieving revision 1.6
retrieving revision 1.6.10.1
diff -u -d -r1.6 -r1.6.10.1
--- acl.vhost.ldif.template 26 Apr 2003 19:21:45 -0000 1.6
+++ acl.vhost.ldif.template 10 Aug 2004 20:54:30 -0000 1.6.10.1
@@ -1,4 +1,4 @@
-dn: ispmanVhostAclLocation=<perl>$r->param("ispmanVhostAclLocation")</perl>,ou=httpAcls,ispmanVhostName=<perl>$r->param("ispmanVhostName")</perl>,ou=httpdata,ispmanDomain=<perl>$r->param("ispmanDomain")</perl>,<perl>$ispman->getConf("ldapBaseDN")</perl>
+dn: ispmanVhostAclLocation=<perl>$r->param("ispmanVhostAclLocation")</perl>,ou=httpAcls,ispmanVhostName=<perl>$r->param("ispmanVhostName")</perl>,ou=httpdata,ispmanDomain=<perl>$r->param("ispmanDomain")</perl>,<perl>ISPMan::Config->get("ldapBaseDN")</perl>
ispmanVhostAclLocation: <perl>$r->param("ispmanVhostAclLocation")</perl>
ispmanVhostName: <perl>$r->param("ispmanVhostName")</perl>
ispmanDomain: <perl>$r->param("ispmanDomain")</perl>
Index: vhost.ldif.template
===================================================================
RCS file: /cvsroot/ispman/ispman/install-data/templates/vhost.ldif.template,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -u -d -r1.10 -r1.10.2.1
--- vhost.ldif.template 9 Jul 2004 22:19:13 -0000 1.10
+++ vhost.ldif.template 10 Aug 2004 20:54:30 -0000 1.10.2.1
@@ -2,7 +2,7 @@
<perl>
$text = '';
-foreach my $oc (@{$ispman->getConf('ispmanVhostObjectclasses')}) {
+foreach my $oc (@{ISPMan::Config->get('ispmanVhostObjectclasses')}) {
$text .= "objectClass: " . $oc . "\n";
}
$text
@@ -19,16 +19,16 @@
(join "/",($r->param("domain_info")->{'homeDirectory'},
"vhosts", $r->param("ispmanVhostName")))</perl>
userPassword: <perl>$ispman->encryptPassWithMethod($r->param("userPassword")||"",
- $ispman->getConf('userPassHashMethod'))</perl>
-loginShell: <perl>$ispman->getConf("vhostShell")</perl>
+ ISPMan::Config->get('userPassHashMethod'))</perl>
+loginShell: <perl>ISPMan::Config->get("vhostShell")</perl>
ispmanVhostServerAlias: <perl>$r->param("ispmanVhostServerAlias") || ""</perl>
FTPStatus: <perl>$r->param("FTPStatus") || "active"</perl>
ispmanStatus: active
ispmanVhostStats: <perl>$r->param("ispmanVhostStats") || "enable"</perl>
-FTPQuotaMBytes: <perl>$r->param("FTPQuotaMBytes") || $ispman->getConf("defaultVhostFtpQuota")</perl>
+FTPQuotaMBytes: <perl>$r->param("FTPQuotaMBytes") || ISPMan::Config->get("defaultVhostFtpQuota")</perl>
ispmanVhostDocumentRoot: <perl>$r->param("ispmanVhostDocumentRoot") || "htdocs"</perl>
ispmanVhostScriptDir: <perl>$r->param("ispmanVhostScriptDir") || "cgi-bin"</perl>
-ispmanVhostIpAddress: <perl>$r->param("ispmanVhostIpAddress") || $ispman->getConf("apacheVhostsIP") || "*"</perl>
+ispmanVhostIpAddress: <perl>$r->param("ispmanVhostIpAddress") || ISPMan::Config->get("apacheVhostsIP") || "*"</perl>
fileHost: <perl>$r->param("fileHost") || $r->param("domain_info")->{'ispmanDomainDefaultFileServer'}</perl>
DestinationAddress: <perl>$r->param("fileHost") || $r->param("domain_info")->{'ispmanDomainDefaultFileServer'}</perl>
@@ -62,15 +62,15 @@
# process ispmanVhostLogdir
$text = "ispmanVhostLogdir: " . ($r->param("ispmanVhostLogdir") ||
- $ispman->substitute($ispman->getConf('apacheLogsDirectory'),$substmap));
+ $ispman->substitute(ISPMan::Config->get('apacheLogsDirectory'),$substmap));
$text .= "\n";
$text .= "ispmanVhostStatdir: " . ($r->param("ispmanVhostStatdir") ||
- $ispman->substitute($ispman->getConf('apacheStatDirectory'),$substmap));
+ $ispman->substitute(ISPMan::Config->get('apacheStatDirectory'),$substmap));
$text
</perl>
<perl>
#If there is a site specific file load and evaluate it
- $template=$ispman->getTemplate(join "/", ($ispman->getConf("installDir"), "templates/vhost.ldif.template.local"));
+ $template=$ispman->getTemplate(join "/", (ISPMan::Config->get("installDir"), "templates/vhost.ldif.template.local"));
return $template->fill_in(PACKAGE => __PACKAGE__);
</perl>
Index: aclid.counter.ldif.template
===================================================================
RCS file: /cvsroot/ispman/ispman/install-data/templates/aclid.counter.ldif.template,v
retrieving revision 1.1
retrieving revision 1.1.26.1
diff -u -d -r1.1 -r1.1.26.1
--- aclid.counter.ldif.template 3 May 2001 03:20:44 -0000 1.1
+++ aclid.counter.ldif.template 10 Aug 2004 20:54:30 -0000 1.1.26.1
@@ -1,4 +1,4 @@
-dn: cn=aclidcounter, ou=counters, <perl>$ispman->getConf("ldapBaseDN")</perl>
+dn: cn=aclidcounter, ou=counters, <perl>ISPMan::Config->get("ldapBaseDN")</perl>
cn: aclidcounter
ou: counters
objectclass: counter
Index: domain.httpusers.ldif.template
===================================================================
RCS file: /cvsroot/ispman/ispman/install-data/templates/domain.httpusers.ldif.template,v
retrieving revision 1.5
retrieving revision 1.5.10.1
diff -u -d -r1.5 -r1.5.10.1
--- domain.httpusers.ldif.template 26 Apr 2003 19:21:45 -0000 1.5
+++ domain.httpusers.ldif.template 10 Aug 2004 20:54:30 -0000 1.5.10.1
@@ -1,4 +1,4 @@
-dn: ou=httpusers, ispmanDomain=<perl>$r->param("ispmanDomain")</perl>, <perl>$ispman->getConf("ldapBaseDN")</perl>
+dn: ou=httpusers, ispmanDomain=<perl>$r->param("ispmanDomain")</perl>, <perl>ISPMan::Config->get("ldapBaseDN")</perl>
ou: httpusers
ispmanDomain: <perl>$r->param("ispmanDomain")</perl>
objectclass: ispmanhttpusersgroup
Index: domain.posixGroup.ldif.template
===================================================================
RCS file: /cvsroot/ispman/ispman/install-data/templates/domain.posixGroup.ldif.template,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -d -r1.1 -r1.1.2.1
--- domain.posixGroup.ldif.template 26 Jun 2004 12:22:08 -0000 1.1
+++ domain.posixGroup.ldif.template 10 Aug 2004 20:54:30 -0000 1.1.2.1
@@ -1,4 +1,4 @@
-dn: cn=<perl>$domain</perl>,ispmanDomain=<perl>$domain</perl>,<perl>$ispman->getConf("ldapBaseDN")</perl>
+dn: cn=<perl>$domain</perl>,ispmanDomain=<perl>$domain</perl>,<perl>ISPMan::Config->get("ldapBaseDN")</perl>
objectclass: posixGroup
gidnumber: <perl>$r->param("gidnumber")</perl>
cn: <perl>$domain</perl>
Index: reseller.ldif.template
===================================================================
RCS file: /cvsroot/ispman/ispman/install-data/templates/reseller.ldif.template,v
retrieving revision 1.2
retrieving revision 1.2.10.1
diff -u -d -r1.2 -r1.2.10.1
--- reseller.ldif.template 24 Apr 2003 20:11:36 -0000 1.2
+++ reseller.ldif.template 10 Aug 2004 20:54:30 -0000 1.2.10.1
@@ -1,4 +1,4 @@
-dn: ispmanResellerId=<perl>$r->param("ispmanResellerId")</perl>, ou=ispman, <perl>$ispman->getConf("ldapBaseDN")</perl>
+dn: ispmanResellerId=<perl>$r->param("ispmanResellerId")</perl>, ou=ispman, <perl>ISPMan::Config->get("ldapBaseDN")</perl>
objectclass: ispmanReseller
ispmanCreateTimestamp: <perl>time()</perl>
ispmanStatus: active
Index: domain.rfc822MailGroup.ldif.template
===================================================================
RCS file: /cvsroot/ispman/ispman/install-data/templates/domain.rfc822MailGroup.ldif.template,v
retrieving revision 1.5
retrieving revision 1.5.12.1
diff -u -d -r1.5 -r1.5.12.1
--- domain.rfc822MailGroup.ldif.template 4 May 2002 22:03:08 -0000 1.5
+++ domain.rfc822MailGroup.ldif.template 10 Aug 2004 20:54:30 -0000 1.5.12.1
@@ -1,4 +1,4 @@
-dn: cn=<perl>$r->param("cn")</perl>, ou=ispmanMailGroup, ispmanDomain=<perl>$r->param("ispmanDomain")</perl>, <perl>$ispman->getConf("ldapBaseDN")</perl>
+dn: cn=<perl>$r->param("cn")</perl>, ou=ispmanMailGroup, ispmanDomain=<perl>$r->param("ispmanDomain")</perl>, <perl>ISPMan::Config->get("ldapBaseDN")</perl>
objectclass: ispmanMailGroup
ispmanDomain: <perl>$r->param("ispmanDomain")</perl>
cn: <perl>$r->param("cn")</perl>
Index: domain.dnszone.ldif.template
===================================================================
RCS file: /cvsroot/ispman/ispman/install-data/templates/domain.dnszone.ldif.template,v
retrieving revision 1.20
retrieving revision 1.20.4.1
diff -u -d -r1.20 -r1.20.4.1
--- domain.dnszone.ldif.template 20 Jun 2004 08:48:04 -0000 1.20
+++ domain.dnszone.ldif.template 10 Aug 2004 20:54:30 -0000 1.20.4.1
@@ -6,19 +6,19 @@
<perl>
#MX Records
-$ispman->make_ldif_mXRecord($domain, '@', 10, $ispman->staticHost($ispman->getConf("primaryMX")));
+$ispman->make_ldif_mXRecord($domain, '@', 10, $ispman->staticHost(ISPMan::Config->get("primaryMX")));
</perl>
<perl>
-$ispman->make_ldif_mXRecord($domain, '@', 20, $ispman->staticHost($ispman->getConf("secondaryMX")));
+$ispman->make_ldif_mXRecord($domain, '@', 20, $ispman->staticHost(ISPMan::Config->get("secondaryMX")));
</perl>
<perl>
#NS Records
-$ispman->make_ldif_nSRecord($domain, '@', $ispman->staticHost($ispman->getConf("primaryDNS")));
+$ispman->make_ldif_nSRecord($domain, '@', $ispman->staticHost(ISPMan::Config->get("primaryDNS")));
</perl>
<perl>
-$ispman->make_ldif_nSRecord($domain, '@', $ispman->staticHost($ispman->getConf("secondaryDNS")));
+$ispman->make_ldif_nSRecord($domain, '@', $ispman->staticHost(ISPMan::Config->get("secondaryDNS")));
</perl>
<perl>
@@ -34,10 +34,10 @@
<perl>
#If there is a site specific file load and evaluate it
-$templatesDir= join "/", ($ispman->getConf("installDir"), 'templates');
+$templatesDir= join "/", (ISPMan::Config->get("installDir"), 'templates');
unless (-d $templatesDir){
# For developers
- $templatesDir= join "/", ($ispman->getConf("installDir"), 'install-data/templates');
+ $templatesDir= join "/", (ISPMan::Config->get("installDir"), 'install-data/templates');
}
Index: domain.extended.ldif.template
===================================================================
RCS file: /cvsroot/ispman/ispman/install-data/templates/domain.extended.ldif.template,v
retrieving revision 1.13
retrieving revision 1.13.2.1
diff -u -d -r1.13 -r1.13.2.1
--- domain.extended.ldif.template 26 Jun 2004 12:22:08 -0000 1.13
+++ domain.extended.ldif.template 10 Aug 2004 20:54:30 -0000 1.13.2.1
@@ -4,8 +4,8 @@
uidNumber: <perl>$r->param("uidnumber")</perl>
gidNumber: <perl>$r->param("gidnumber")</perl>
homeDirectory: <perl>$r->param("homeDirectory")</perl>
-userPassword: <perl>$ispman->encryptPassWithMethod($r->param("userPassword"),$ispman->getConf('userPassHashMethod'))</perl>
-loginShell: <perl>$r->param("loginShell") || $ispman->getConf("domainShell");</perl>
+userPassword: <perl>$ispman->encryptPassWithMethod($r->param("userPassword"),ISPMan::Config->get('userPassHashMethod'))</perl>
+loginShell: <perl>$r->param("loginShell") || ISPMan::Config->get("domainShell");</perl>
ispmanMaxAccounts: <perl>$r->param("ispmanMaxAccounts")||"-1"</perl>
ispmanMaxVhosts: <perl>$r->param("ispmanMaxVhosts")||"-1"</perl>
<perl>join "\n", map{"ispmanDomainService: $_"} split(",", $r->param("ispmanDomainServices"))</perl>
Index: users.ldif.template
===================================================================
RCS file: /cvsroot/ispman/ispman/install-data/templates/users.ldif.template,v
retrieving revision 1.15
retrieving revision 1.15.4.1
diff -u -d -r1.15 -r1.15.4.1
--- users.ldif.template 18 Apr 2004 19:19:32 -0000 1.15
+++ users.ldif.template 10 Aug 2004 20:54:30 -0000 1.15.4.1
@@ -1,7 +1,7 @@
-dn: uid=<perl>$r->param("uid")</perl>, ou=users, ispmanDomain=<perl>$r->param("ispmanDomain")</perl>, <perl>$ispman->getConf("ldapBaseDN")</perl>
+dn: uid=<perl>$r->param("uid")</perl>, ou=users, ispmanDomain=<perl>$r->param("ispmanDomain")</perl>, <perl>ISPMan::Config->get("ldapBaseDN")</perl>
<perl>
$text = '';
-foreach my $oc (@{$ispman->getConf('ispmanUserObjectclasses')}) {
+foreach my $oc (@{ISPMan::Config->get('ispmanUserObjectclasses')}) {
$text .= "objectClass: " . $oc . "\n";
}
$text
@@ -31,7 +31,7 @@
uidNumber: <perl>$ispman->getUid()</perl>
gidNumber: <perl>$ispman->getDomainGid($r->param("ispmanDomain"))</perl>
homeDirectory: <perl>join '/', ($r->param("domaininfo")->{'homeDirectory'}, "users", $r->param("uid"))</perl>
-loginShell: <perl>$r->param("loginShell")||$ispman->getConf("loginShell")</perl>
+loginShell: <perl>$r->param("loginShell")||ISPMan::Config->get("loginShell")</perl>
ispmanStatus: active
ispmanCreateTimestamp: <perl>time()</perl>
@@ -39,7 +39,7 @@
ispmanDomain: <perl>$r->param("ispmanDomain")</perl>
DestinationAddress: <perl>$r->param("fileHost") || "127.0.0.1"</perl>
-DestinationPort: <perl>$ispman->getConf("FTPDestinationPort") || $r->param("DestinationPort") || 21</perl>
+DestinationPort: <perl>ISPMan::Config->get("FTPDestinationPort") || $r->param("DestinationPort") || 21</perl>
FTPStatus: <perl>$r->param("FTPStatus")</perl>
FTPQuotaMBytes: <perl>$r->param("FTPQuotaMBytes")</perl>
@@ -60,7 +60,7 @@
<perl>
#If there is a site specific file load and evaluate it
- $template=$ispman->getTemplate(join "/", ($ispman->getConf("installDir"), "templates/users.ldif.template.local"));
+ $template=$ispman->getTemplate(join "/", (ISPMan::Config->get("installDir"), "templates/users.ldif.template.local"));
return $template->fill_in(PACKAGE => __PACKAGE__);
</perl>
-------------------------------------------------------
SF.Net email is sponsored by Shop4tech.com-Lowest price on Blank Media
100pk Sonic DVD-R 4x for only $29 -100pk Sonic DVD+R for only $33
Save 50% off Retail on Ink & Toner - Free Shipping and Free Gift.
http://www.shop4tech.com/z/Inkjet_Cartridges/9_108_r285