Bugzilla Bug #553078 - Apply "registry" logic to pki-tps . . .

Bugzilla Bug #553852 - Review Request: pki-tps - The Dogtag PKI System Token
Processing System


git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@956 c9f7a03b-bd48-0410-a16d-cbbf54688b0b

17 files changed, 18 insertions, 18 deletions

diff --git a/pki/base/tps/forms/esc/cgi-bin/so/enroll.cgi b/pki/base/tps/forms/esc/cgi-bin/so/enroll.cgi
index 4ad46abfe..148cd78c0 100755
--- a/pki/base/tps/forms/esc/cgi-bin/so/enroll.cgi
+++ b/pki/base/tps/forms/esc/cgi-bin/so/enroll.cgi
@@ -32,7 +32,7 @@
 #    
 ########################################################################
 
-require "../sow/cfg.pl";
+[REQUIRE_CFG_PL]
 
 use CGI;
 
diff --git a/pki/base/tps/forms/esc/cgi-bin/sow/ajax-list.cgi b/pki/base/tps/forms/esc/cgi-bin/sow/ajax-list.cgi
index 6d6db81a7..b3c2a3084 100755
--- a/pki/base/tps/forms/esc/cgi-bin/sow/ajax-list.cgi
+++ b/pki/base/tps/forms/esc/cgi-bin/sow/ajax-list.cgi
@@ -23,7 +23,7 @@
 
 use CGI;
 
-require "./cfg.pl";
+[REQUIRE_CFG_PL]
 
 my $ldapHost = get_ldap_host();
 my $ldapPort = get_ldap_port();
diff --git a/pki/base/tps/forms/esc/cgi-bin/sow/enroll.cgi b/pki/base/tps/forms/esc/cgi-bin/sow/enroll.cgi
index b78448c77..b8da0908a 100755
--- a/pki/base/tps/forms/esc/cgi-bin/sow/enroll.cgi
+++ b/pki/base/tps/forms/esc/cgi-bin/sow/enroll.cgi
@@ -32,7 +32,7 @@
 #    
 ########################################################################
 
-require "./cfg.pl";
+[REQUIRE_CFG_PL]
 
 use CGI;
 
diff --git a/pki/base/tps/forms/esc/cgi-bin/sow/enroll_temp.cgi b/pki/base/tps/forms/esc/cgi-bin/sow/enroll_temp.cgi
index 510c186a5..74628fb67 100755
--- a/pki/base/tps/forms/esc/cgi-bin/sow/enroll_temp.cgi
+++ b/pki/base/tps/forms/esc/cgi-bin/sow/enroll_temp.cgi
@@ -32,7 +32,7 @@
 #    
 ########################################################################
 
-require "./cfg.pl";
+[REQUIRE_CFG_PL]
 
 use CGI;
 
diff --git a/pki/base/tps/forms/esc/cgi-bin/sow/format.cgi b/pki/base/tps/forms/esc/cgi-bin/sow/format.cgi
index 7b370f555..9b310991d 100755
--- a/pki/base/tps/forms/esc/cgi-bin/sow/format.cgi
+++ b/pki/base/tps/forms/esc/cgi-bin/sow/format.cgi
@@ -32,7 +32,7 @@
 #    
 ########################################################################
 
-require "./cfg.pl";
+[REQUIRE_CFG_PL]
 
 use CGI;
 
diff --git a/pki/base/tps/forms/esc/cgi-bin/sow/formatso.cgi b/pki/base/tps/forms/esc/cgi-bin/sow/formatso.cgi
index 343d33830..d53129139 100755
--- a/pki/base/tps/forms/esc/cgi-bin/sow/formatso.cgi
+++ b/pki/base/tps/forms/esc/cgi-bin/sow/formatso.cgi
@@ -32,7 +32,7 @@
 #    
 ########################################################################
 
-require "./cfg.pl";
+[REQUIRE_CFG_PL]
 
 use CGI;
 
diff --git a/pki/base/tps/forms/esc/cgi-bin/sow/index.cgi b/pki/base/tps/forms/esc/cgi-bin/sow/index.cgi
index 43a31e8d5..7f7a98869 100755
--- a/pki/base/tps/forms/esc/cgi-bin/sow/index.cgi
+++ b/pki/base/tps/forms/esc/cgi-bin/sow/index.cgi
@@ -31,10 +31,10 @@ print "Fedora Project";   # Vendor
 print "</IssuerName>\n";
 print "<Services>";
 print "<Operation>";
-print "https://water.sfbay.redhat.com:7889/nk_service";
+print "https://[SERVER_NAME]:[SECURE_PORT]/nk_service";
 print "</Operation>";
 print "<UI>";
-print "https://water.sfbay.redhat.com:7889/cgi-bin/sow/search.cgi";
+print "https://[SERVER_NAME]:[SECURE_PORT]/cgi-bin/sow/search.cgi";
 print "</UI>";
 print "<EnrolledTokenBrowserURL>";
 print "</EnrolledTokenBrowserURL>";
diff --git a/pki/base/tps/forms/esc/cgi-bin/sow/is_agent.cgi b/pki/base/tps/forms/esc/cgi-bin/sow/is_agent.cgi
index 791319dae..c6b6a87f7 100755
--- a/pki/base/tps/forms/esc/cgi-bin/sow/is_agent.cgi
+++ b/pki/base/tps/forms/esc/cgi-bin/sow/is_agent.cgi
@@ -23,7 +23,7 @@
 
 use CGI;
 
-require "./cfg.pl";
+[REQUIRE_CFG_PL]
 
 
 my $ldapHost = get_ldap_host();
diff --git a/pki/base/tps/forms/esc/cgi-bin/sow/is_user.cgi b/pki/base/tps/forms/esc/cgi-bin/sow/is_user.cgi
index cb64214f1..d7a551421 100755
--- a/pki/base/tps/forms/esc/cgi-bin/sow/is_user.cgi
+++ b/pki/base/tps/forms/esc/cgi-bin/sow/is_user.cgi
@@ -25,7 +25,7 @@ use CGI;
 
 use CGI::Carp qw(fatalsToBrowser);
 
-require "./cfg.pl";
+[REQUIRE_CFG_PL]
 
 
 my $ldapHost = get_ldap_host();
diff --git a/pki/base/tps/forms/esc/cgi-bin/sow/main.cgi b/pki/base/tps/forms/esc/cgi-bin/sow/main.cgi
index 349ebe056..710e81e0c 100755
--- a/pki/base/tps/forms/esc/cgi-bin/sow/main.cgi
+++ b/pki/base/tps/forms/esc/cgi-bin/sow/main.cgi
@@ -23,7 +23,7 @@
 
 use CGI;
 
-require "./cfg.pl";
+[REQUIRE_CFG_PL]
 
 
 my $ldapHost = get_ldap_host();
diff --git a/pki/base/tps/forms/esc/cgi-bin/sow/noaccess.cgi b/pki/base/tps/forms/esc/cgi-bin/sow/noaccess.cgi
index 3c3dc6ba9..17166bcb6 100755
--- a/pki/base/tps/forms/esc/cgi-bin/sow/noaccess.cgi
+++ b/pki/base/tps/forms/esc/cgi-bin/sow/noaccess.cgi
@@ -23,7 +23,7 @@
 
 use CGI;
 
-require "./cfg.pl";
+[REQUIRE_CFG_PL]
 
 
 my $host = get_host();
diff --git a/pki/base/tps/forms/esc/cgi-bin/sow/read.cgi b/pki/base/tps/forms/esc/cgi-bin/sow/read.cgi
index df226e009..e2022c5b9 100755
--- a/pki/base/tps/forms/esc/cgi-bin/sow/read.cgi
+++ b/pki/base/tps/forms/esc/cgi-bin/sow/read.cgi
@@ -23,7 +23,7 @@
 
 use CGI;
 
-require "./cfg.pl";
+[REQUIRE_CFG_PL]
 
 
 my $ldapHost = get_ldap_host();
diff --git a/pki/base/tps/forms/esc/cgi-bin/sow/read_temp.cgi b/pki/base/tps/forms/esc/cgi-bin/sow/read_temp.cgi
index c22b8a760..51e6549fb 100755
--- a/pki/base/tps/forms/esc/cgi-bin/sow/read_temp.cgi
+++ b/pki/base/tps/forms/esc/cgi-bin/sow/read_temp.cgi
@@ -23,7 +23,7 @@
 
 use CGI;
 
-require "./cfg.pl";
+[REQUIRE_CFG_PL]
 
 
 my $ldapHost = get_ldap_host();
diff --git a/pki/base/tps/forms/esc/cgi-bin/sow/search.cgi b/pki/base/tps/forms/esc/cgi-bin/sow/search.cgi
index ece353199..9c22c1fb4 100755
--- a/pki/base/tps/forms/esc/cgi-bin/sow/search.cgi
+++ b/pki/base/tps/forms/esc/cgi-bin/sow/search.cgi
@@ -23,7 +23,7 @@
 
 use CGI;
 
-require "./cfg.pl";
+[REQUIRE_CFG_PL]
 
 
 my $ldapHost = get_ldap_host();
diff --git a/pki/base/tps/forms/esc/cgi-bin/sow/search_temp.cgi b/pki/base/tps/forms/esc/cgi-bin/sow/search_temp.cgi
index 9bfd1be0c..b8a411a12 100755
--- a/pki/base/tps/forms/esc/cgi-bin/sow/search_temp.cgi
+++ b/pki/base/tps/forms/esc/cgi-bin/sow/search_temp.cgi
@@ -23,7 +23,7 @@
 
 use CGI;
 
-require "./cfg.pl";
+[REQUIRE_CFG_PL]
 
 
 my $ldapHost = get_ldap_host();
diff --git a/pki/base/tps/forms/esc/cgi-bin/sow/seturl.cgi b/pki/base/tps/forms/esc/cgi-bin/sow/seturl.cgi
index 2718d710c..dfac46d8f 100755
--- a/pki/base/tps/forms/esc/cgi-bin/sow/seturl.cgi
+++ b/pki/base/tps/forms/esc/cgi-bin/sow/seturl.cgi
@@ -32,7 +32,7 @@
 #    
 ########################################################################
 
-require "./cfg.pl";
+[REQUIRE_CFG_PL]
 
 use CGI;
 
diff --git a/pki/base/tps/forms/esc/cgi-bin/sow/welcome.cgi b/pki/base/tps/forms/esc/cgi-bin/sow/welcome.cgi
index f2eed1de0..af7687c35 100755
--- a/pki/base/tps/forms/esc/cgi-bin/sow/welcome.cgi
+++ b/pki/base/tps/forms/esc/cgi-bin/sow/welcome.cgi
@@ -23,7 +23,7 @@
 
 use CGI;
 
-require "./cfg.pl";
+[REQUIRE_CFG_PL]
 
 
 my $host = get_host();