projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
a6cbda0
)
popurl(3) won't give us a good freeside base url since RT calls it from multiple...
author
ivan
<ivan>
Sat, 12 Mar 2005 16:07:29 +0000
(16:07 +0000)
committer
ivan
<ivan>
Sat, 12 Mar 2005 16:07:29 +0000
(16:07 +0000)
Makefile
patch
|
blob
|
history
httemplate/docs/install-rt.html
patch
|
blob
|
history
rt/etc/RT_SiteConfig.pm
patch
|
blob
|
history
rt/lib/RT/URI/freeside.pm
patch
|
blob
|
history
rt/lib/RT/URI/freeside/Internal.pm
patch
|
blob
|
history
rt/lib/RT/URI/freeside/XMLRPC.pm
patch
|
blob
|
history
diff --git
a/Makefile
b/Makefile
index
215ec14
..
4f8bebe
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-83,6
+83,7
@@
RT_ENABLED = 0
RT_DOMAIN = example.com
RT_TIMEZONE = US/Pacific;
#RT_TIMEZONE = US/Eastern;
RT_DOMAIN = example.com
RT_TIMEZONE = US/Pacific;
#RT_TIMEZONE = US/Eastern;
+FREESIDE_URL = "http://localhost/freeside/"
#for now, same db as specified in DATASOURCE... eventually, otherwise?
RT_DB_DATABASE = freeside
#for now, same db as specified in DATASOURCE... eventually, otherwise?
RT_DB_DATABASE = freeside
@@
-273,6
+274,7
@@
create-rt: configure-rt
perl -p -i -e "\
s'%%%RT_DOMAIN%%%'${RT_DOMAIN}'g;\
s'%%%RT_TIMEZONE%%%'${RT_TIMEZONE}'g;\
perl -p -i -e "\
s'%%%RT_DOMAIN%%%'${RT_DOMAIN}'g;\
s'%%%RT_TIMEZONE%%%'${RT_TIMEZONE}'g;\
+ s'%%%FREESIDE_URL%%%'${FREESIDE_URL}'g;\
" ${RT_PATH}/etc/RT_SiteConfig.pm
install-rt:
" ${RT_PATH}/etc/RT_SiteConfig.pm
install-rt:
diff --git
a/httemplate/docs/install-rt.html
b/httemplate/docs/install-rt.html
index
43d9155
..
328914b
100644
(file)
--- a/
httemplate/docs/install-rt.html
+++ b/
httemplate/docs/install-rt.html
@@
-32,6
+32,8
@@
<p>Create a new Unix group called 'rt'
<p>Create a new Unix group called 'rt'
+<p>Edit the top-level Makefile, set RT_ENABLED to 1 and set the RT_DOMAIN, RT_TIMEZONE, and FREESIDE_URL variables.
+
<p><pre>make configure-rt
make create-rt
make install-rt
<p><pre>make configure-rt
make create-rt
make install-rt
diff --git
a/rt/etc/RT_SiteConfig.pm
b/rt/etc/RT_SiteConfig.pm
index
5b97471
..
5c116c4
100644
(file)
--- a/
rt/etc/RT_SiteConfig.pm
+++ b/
rt/etc/RT_SiteConfig.pm
@@
-11,6
+11,7
@@
$RT::WebFallbackToInternal = 1; #no
$RT::WebExternalAuto = 1;
$RT::URI::freeside::IntegrationType = 'Internal';
$RT::WebExternalAuto = 1;
$RT::URI::freeside::IntegrationType = 'Internal';
+$RT::URI::freeside::URL = '%%%FREESIDE_URL%%%';
Set($DatabaseHost , '');
Set($DatabaseHost , '');
diff --git
a/rt/lib/RT/URI/freeside.pm
b/rt/lib/RT/URI/freeside.pm
index
bd617f9
..
687f923
100644
(file)
--- a/
rt/lib/RT/URI/freeside.pm
+++ b/
rt/lib/RT/URI/freeside.pm
@@
-28,7
+28,7
@@
package RT::URI::freeside;
use RT::URI::base;
use strict;
use RT::URI::base;
use strict;
-use vars qw(@ISA $IntegrationType);
+use vars qw(@ISA $IntegrationType
$URL
);
@ISA = qw/RT::URI::base/;
@ISA = qw/RT::URI::base/;
@@
-62,7
+62,7
@@
Returns the URL for freeside's web interface.
=cut
=cut
-sub FreesideURL { return
undef
; }
+sub FreesideURL { return
$URL
; }
=item FreesideVersion
=item FreesideVersion
diff --git
a/rt/lib/RT/URI/freeside/Internal.pm
b/rt/lib/RT/URI/freeside/Internal.pm
index
cdadd1e
..
1830779
100644
(file)
--- a/
rt/lib/RT/URI/freeside/Internal.pm
+++ b/
rt/lib/RT/URI/freeside/Internal.pm
@@
-86,12
+86,6
@@
sub _FreesideGetRecord {
}
}
-sub FreesideURL {
-
- return popurl(3);
-
-}
-
sub FreesideVersion {
return $FS::VERSION;
sub FreesideVersion {
return $FS::VERSION;
diff --git
a/rt/lib/RT/URI/freeside/XMLRPC.pm
b/rt/lib/RT/URI/freeside/XMLRPC.pm
index
618364c
..
a8a731f
100644
(file)
--- a/
rt/lib/RT/URI/freeside/XMLRPC.pm
+++ b/
rt/lib/RT/URI/freeside/XMLRPC.pm
@@
-28,7
+28,7
@@
use strict;
no warnings qw(redefine);
use strict;
no warnings qw(redefine);
-use vars qw($
URL $
XMLRPC_URL $_FS_VERSION);
+use vars qw($XMLRPC_URL $_FS_VERSION);
use Frontier::Client;
use Frontier::Client;
@@
-95,12
+95,6
@@
sub FreesideGetConfig {
}
}
-sub FreesideURL {
-
- return $URL;
-
-}
-
sub FreesideVersion {
return $_FS_VERSION if ($_FS_VERSION =~ /^\d+\.\d+\.\d+/);
sub FreesideVersion {
return $_FS_VERSION if ($_FS_VERSION =~ /^\d+\.\d+\.\d+/);