11:21 a.m.
Hi all, I've created a couple of patches to trove-setup. The effect of these should be
to remove cgi-bin/cgit.cgi from all trove URLs and redirect appropriately, and to add a
cgit filter for stratum morphologies in definitions.git that will add a hyperlink to the
repo, ref and unpetrify-ref values, linking to their appropriate locations in the trove.
I'm currently upgrading my test trove to test these changes, however if anyone has an
active trove currently they would like to test with, that would be fine!
Lauren Perry (2):
Redirect cgi-bin/cgit.cgi urls and remove the index refresh
Add hyperlink filter script and reference in cgitrc
etc/hyperlink_filter.py | 53 +++++++++++++++++++++++++++++++++++++++++++++
etc/lighttpd/git-httpd.conf | 2 ++
http-assets/index.html | 1 -
share/etc/cgitrc | 4 ++++
4 files changed, 59 insertions(+), 1 deletion(-)
create mode 100644 etc/hyperlink_filter.py
--
2.1.4
11:21 a.m.
New subject: [RFC 1/2] Redirect cgi-bin/cgit.cgi urls and remove the index refresh
---
etc/lighttpd/git-httpd.conf | 2 ++
http-assets/index.html | 1 -
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/etc/lighttpd/git-httpd.conf b/etc/lighttpd/git-httpd.conf
index dea86de..22a9765 100644
--- a/etc/lighttpd/git-httpd.conf
+++ b/etc/lighttpd/git-httpd.conf
@@ -49,6 +49,7 @@ $HTTP["url"] =~ ".*/gitano-command.cgi$" {
$HTTP["url"] =~ "^/git/.*$" {
alias.url += ( "/git" =>
"/var/www/htdocs/gitano-smart-http.cgi" )
+
cgi.assign = ("" => "")
setenv.add-environment = (
"GIT_HTTP_EXPORT_ALL" => "",
@@ -69,3 +70,4 @@ $HTTP["scheme"] == "https" {
include "git-auth.conf"
}
}
+url.redirect = ( "^(?=.*?cgi-bin/cgit.cgi/).*$" => "" )
diff --git a/http-assets/index.html b/http-assets/index.html
index 0a8c3f9..94d424a 100644
--- a/http-assets/index.html
+++ b/http-assets/index.html
@@ -1,5 +1,4 @@
<html><head>
-<meta http-equiv="refresh" content="0; /cgi-bin/cgit.cgi">
</head>
<body>
</body>
--
2.1.4
11:21 a.m.
New subject: [RFC 2/2] Add hyperlink filter script and reference in cgitrc
---
etc/hyperlink_filter.py | 53 +++++++++++++++++++++++++++++++++++++++++++++++++
share/etc/cgitrc | 4 ++++
2 files changed, 57 insertions(+)
create mode 100644 etc/hyperlink_filter.py
diff --git a/etc/hyperlink_filter.py b/etc/hyperlink_filter.py
new file mode 100644
index 0000000..0f1f1f5
--- /dev/null
+++ b/etc/hyperlink_filter.py
@@ -0,0 +1,53 @@
+import os
+from shutil import move
+import subprocess
+
+def set_url(upstream, repo, modifier, text):
+ base_url = 'http://git.baserock.org/%s/%s.git%s' % (
+ upstream, repo, modifier)
+ url = '<a href=\"%s\">%s</a>' % (base_url, text)
+ return url
+
+def add_hyperlink():
+ for morphology in os.listdir('strata'):
+ source_file = ''.join(['strata/', morphology])
+ url_file = ''.join(['strata/', morphology, '.tmp'])
+ if morphology.endswith('.morph'):
+ fin = open(source_file, 'r')
+ fout = open(url_file, 'wt')
+ lines = fin.readlines()
+ for i in range (0, len(lines)):
+ line = lines[i]
+ if 'repo' in line:
+ upstream = ''
+ if 'upstream' in line:
+ upstream = 'delta'
+ else:
+ upstream = 'baserock/morph'
+ repo = line[17:(len(line) - 1)]
+ # Cut off preceeding ` repo: upstream: | baserock:` and
+ # successive new line
+ repo_url = set_url(upstream, repo, '', repo)
+ fout.write(line.replace(repo, repo_url))
+ line = lines[i+1]
+
+ ref = line[7:(len(line) - 1)]
+ ref_url = set_url(upstream, repo, ('/commit/?id=%s' % ref),
+ ref)
+ fout.write(line.replace(ref, ref_url))
+ line = lines[i+2]
+
+ u_ref = line[17:(len(line) - 1)]
+ u_ref_url = set_url(upstream, repo, ('/log/?h=%s' % u_ref),
+ u_ref)
+ fout.write(line.replace(u_ref, u_ref_url))
+ i += 3
+ elif 'ref' in line:
+ pass
+ else:
+ fout.write(line)
+ fin.close()
+ fout.close()
+ move(url_file, source_file)
+
+add_hyperlink()
diff --git a/share/etc/cgitrc b/share/etc/cgitrc
index 28540dd..ba92634 100644
--- a/share/etc/cgitrc
+++ b/share/etc/cgitrc
@@ -23,4 +23,8 @@ mimetype.pdf=application/pdf
mimetype.png=image/png
mimetype.svg=image/svg+xml
+repo.url=definitions
+repo.path=/home/git/repos/definitions.git
+repo.source-filter=/home/git/repos/trove-setup/etc/hyperlink_filter.py
+
scan-path=/home/git/repos/
--
2.1.4
11:29 a.m.
On Thu, Oct 29, 2015 at 15:21:31 +0000, Lauren Perry wrote:
Hi all, I've created a couple of patches to trove-setup. The
effect of these
should be to remove cgi-bin/cgit.cgi from all trove URLs and redirect
appropriately, and to add a cgit filter for stratum morphologies in
definitions.git that will add a hyperlink to the repo, ref and unpetrify-ref
values, linking to their appropriate locations in the trove.
This sounds really useful.
Have you confirmed that your lighttpd configuration changes have not affected
http cloning or https pushing? If so, then this sounds awesome.
D.
--
Daniel Silverstone http://www.codethink.co.uk/
Software Engineer GPG 4096/R Key Id: 3CCE BABE 206C 3B69
11:43 a.m.
On 29/10/15 15:29, Daniel Silverstone wrote:
On Thu, Oct 29, 2015 at 15:21:31 +0000, Lauren Perry wrote:
> Hi all, I've created a couple of patches to trove-setup. The effect of these
> should be to remove cgi-bin/cgit.cgi from all trove URLs and redirect
> appropriately, and to add a cgit filter for stratum morphologies in
> definitions.git that will add a hyperlink to the repo, ref and unpetrify-ref
> values, linking to their appropriate locations in the trove.
This sounds really useful.
Have you confirmed that your lighttpd configuration changes have not affected
http cloning or https pushing? If so, then this sounds awesome.
D.
I haven't so far; I'm currently rebuilding after making a small change
to the URL filter, so hopefully once that's finished and upgraded I can
test that out!
2438
days inactive
2438
days old
4 comments
2 participants
participants (2)
-
Daniel Silverstone -
Lauren Perry