show public and private git urls if configured

diff --git a/data/config.php.dist b/data/config.php.dist
index b213e85af7db1f464234a78cca29220093624416..8ef80e9ddb06bea77d586ecf0b6585caad55182a 100644 (file)
--- a/data/config.php.dist
+++ b/data/config.php.dist
@@ -1,3 +1,5 @@
 <?php
 <?php

-//$GLOBALS['phorkie']['cfg']['repos'] = '/var/data/phorkie/';
+//$GLOBALS['phorkie']['cfg']['repos'] = '/var/cache/git/paste/';
+//$GLOBALS['phorkie']['cfg']['git']['public'] = 'git://bogo/git/paste/';
+//$GLOBALS['phorkie']['cfg']['git']['private'] = 'ssh://git@bogo:paste/';

 ?>
 ?>

diff --git a/data/templates/display.htm b/data/templates/display.htm
index f9ab2e58aa3b206ee59a1c47a97cd6051f2bf34f..da75cd9c53190c13998fdadbc56d6d49ba324439 100644 (file)
--- a/data/templates/display.htm
+++ b/data/templates/display.htm
@@ -23,6 +23,27 @@
  </div>
 </div>
 
  </div>
 </div>
 

+{% if repo.getCloneURL(true) or repo.getCloneURL(false) %}
+<div class="well">
+ {% if repo.getCloneURL(true) %}
+ <div class="row-fluid">
+  <div class="span3">Public clone URL</div>
+  <div class="span9">
+   <a href="{{repo.getCloneURL(true)}}">{{repo.getCloneURL(true)}}</a>
+  </div>
+ </div>
+ {% endif %}
+ {% if repo.getCloneURL(false) %}
+ <div class="row-fluid">
+  <div class="span3">Private clone URL</div>
+  <div class="span9">
+   <a href="{{repo.getCloneURL(false)}}">{{repo.getCloneURL(false)}}</a>
+  </div>
+ </div>
+ {% endif %}
+</div>
+{% endif %}
+

 {% for file in repo.getFiles %}
 <div class="file">
  <div class="header">
 {% for file in repo.getFiles %}
 <div class="file">
  <div class="header">

diff --git a/src/phorkie/Repository.php b/src/phorkie/Repository.php
index fef565655c295a3deda9f2f7d706d66ddfe5334a..6dec015538b788e5b556fbbef66a45bf2302d76c 100644 (file)
--- a/src/phorkie/Repository.php
+++ b/src/phorkie/Repository.php
@@ -152,6 +152,14 @@ class Repository
         throw new Exception('Unknown link type');
     }
 
         throw new Exception('Unknown link type');
     }
 

+    public function getCloneURL($public = true)
+    {
+        $var = $public ? 'public' : 'private';
+        if (isset($GLOBALS['phorkie']['cfg']['git'][$var])) {
+            return $GLOBALS['phorkie']['cfg']['git'][$var] . $this->id . '/.git';
+        }
+        return null;
+    }

 }
 
 ?>
 }
 
 ?>

diff --git a/src/phorkie/Repository/Post.php b/src/phorkie/Repository/Post.php
index 627aa1fae53d83335a713e6281eef48873b743a7..828dbadb16e897c8c36833b4d9a82cd968cc7778 100644 (file)
--- a/src/phorkie/Repository/Post.php
+++ b/src/phorkie/Repository/Post.php
@@ -87,9 +87,13 @@ class Repository_Post
         $repo = $rs->createNew();
         $vc = $repo->getVc();
         $vc->initRepository();
         $repo = $rs->createNew();
         $vc = $repo->getVc();
         $vc->initRepository();

+

         foreach (glob($repo->repoDir . '/.git/hooks/*') as $hookfile) {
             unlink($hookfile);
         }
         foreach (glob($repo->repoDir . '/.git/hooks/*') as $hookfile) {
             unlink($hookfile);
         }

+
+        touch($repo->repoDir . '/.git/git-daemon-export-ok');
+

         return $repo;
     }
 
         return $repo;
     }