Durr, Repo.pm needs to actually talk to Config.pm.

2 files changed, 9 insertions, 9 deletions

diff --git a/usr/src/libpiny/lib/Piny/Config.pm b/usr/src/libpiny/lib/Piny/Config.pm
index ddc546a..ecc6d89 100644
--- a/usr/src/libpiny/lib/Piny/Config.pm
+++ b/usr/src/libpiny/lib/Piny/Config.pm
@@ -100,7 +100,7 @@ sub _build_ikiwiki_secure_url {
   if ( exists $s->_conf->{"ikiwiki_secure_url"} ) {
     return $s->_conf->{"ikiwiki_secure_url"};
   } else {
-    return "https://secure.piny.be/repos/";
+    return "https://secure.piny.be/";
   };
 };
 
@@ -110,7 +110,7 @@ sub _build_ikiwiki_secure_path {
   if ( exists $s->_conf->{"ikiwiki_secure_path"} ) {
     return $s->_conf->{"ikiwiki_secure_path"};
   } else {
-    return "/srv/www/secure.piny.be/repos/";
+    return "/srv/www/secure.piny.be/";
   };
 };
 
diff --git a/usr/src/libpiny/lib/Piny/Repo.pm b/usr/src/libpiny/lib/Piny/Repo.pm
index 62f01f3..7cffd68 100644
--- a/usr/src/libpiny/lib/Piny/Repo.pm
+++ b/usr/src/libpiny/lib/Piny/Repo.pm
@@ -441,31 +441,31 @@ sub _build_ikiwiki_setup {
 sub _build_ikiwiki_destdir {
   my ( $s ) = @_;
 
-  return "/srv/www/piny.be/" . $s->name;
+  return Piny::Config->instance->ikiwiki_destdir . $s->name;
 };
 
 sub _build_ikiwiki_srcdir {
   my ( $s ) = @_;
 
-  return "/srv/ikiwiki/" . $s->name;
+  return Piny::Config->instance->ikiwiki_srcdir . $s->name;
 };
 
 sub _build_ikiwiki_url {
   my ( $s ) = @_;
 
-  return "http://piny.be/" . $s->name;
+  return Piny::Config->instance->ikiwiki_url . $s->name;
 };
 
 sub _build_ikiwiki_cgiurl {
   my ( $s ) = @_;
 
-  return "https://secure.piny.be/repos/" . $s->name . "/ikiwiki.cgi";
+  return Piny::Config->instance->ikiwiki_secure_url . "repos/" . $s->name . "/ikiwiki.cgi";
 };
 
 sub _build_secure_path {
   my ( $s ) = @_;
 
-  return "/srv/www/secure.piny.be/repos/" . $s->name;
+  return Piny::Config->instance->ikiwiki_secure_path . "repos/" . $s->name;
 };
 
 sub _build_ikiwiki_cgipath {
@@ -477,13 +477,13 @@ sub _build_ikiwiki_cgipath {
 sub _build_ikiwiki_historyurl {
   my ( $s ) = @_;
 
-  return "https://secure.piny.be/cgit/" . $s->name . "/log/[[file]]";
+  return Piny::Config->instance->ikiwiki_secure_url . "cgit/" . $s->name . "/log/[[file]]";
 };
 
 sub _build_ikiwiki_diffurl {
   my ( $s ) = @_;
 
-  return "https://secure.piny.be/cgit/" . $s->name . "/diff/?id=[[sha1_commit]]";
+  return Piny::Config->instance->ikiwiki_secure_url . "cgit/" . $s->name . "/diff/?id=[[sha1_commit]]";
 };
 
 sub _build_apache_config {