diff options
| -rw-r--r-- | libpiny/share/ikiwiki.setup | 2 | ||||
| -rw-r--r-- | pinyconfigs/debian/changelog | 6 | ||||
| -rw-r--r-- | pinyconfigs/debian/control | 2 | ||||
| -rw-r--r-- | pinyconfigs/etc/apache2/sites-available/piny | 5 | ||||
| -rwxr-xr-x | pinyweb/cgi-bin/checkconstraint.cgi | 41 | ||||
| -rwxr-xr-x[-rw-r--r--] | pinyweb/cgi-bin/newuser.cgi | 0 | ||||
| -rw-r--r-- | pinyweb/debian/changelog | 7 | ||||
| -rw-r--r-- | pinyweb/debian/control | 2 |
8 files changed, 62 insertions, 3 deletions
diff --git a/libpiny/share/ikiwiki.setup b/libpiny/share/ikiwiki.setup index 18f8418..e6619d4 100644 --- a/libpiny/share/ikiwiki.setup +++ b/libpiny/share/ikiwiki.setup @@ -54,7 +54,7 @@ use IkiWiki::Setup::Standard { prefix_directives => 1, httpauth => 1, # To add plugins, list them here. - add_plugins => [qw{sidebar toc meta table tag graphviz httpauth img attachment rename remove map teximg version edittemplate}], + add_plugins => [qw{sidebar toc meta table tag graphviz httpauth img attachment rename remove map teximg version edittemplate rawhtml}], disable_plugins => [qw{openid passwordauth}], teximg_prefix => "\\documentclass{scrartcl} \\usepackage[version=3]{mhchem} diff --git a/pinyconfigs/debian/changelog b/pinyconfigs/debian/changelog index 038fb49..c5fb6bf 100644 --- a/pinyconfigs/debian/changelog +++ b/pinyconfigs/debian/changelog @@ -1,3 +1,9 @@ +pinyconfigs (0.3) unstable; urgency=low + + * Depend on pinyweb. + + -- Julian Blake Kongslie <jblake@omgwallhack.org> Tue, 18 Jan 2011 17:55:46 -0800 + pinyconfigs (0.2) unstable; urgency=low * Standards version. diff --git a/pinyconfigs/debian/control b/pinyconfigs/debian/control index 1af1c86..cce693f 100644 --- a/pinyconfigs/debian/control +++ b/pinyconfigs/debian/control @@ -8,7 +8,7 @@ Standards-version: 3.9.1 Package: pinyconfigs Architecture: all -Depends: ${misc:Depends} +Depends: ${misc:Depends}, pinyweb (>= 0.8) Description: Configuration files for piny The configuration files needed for a piny configuration. . diff --git a/pinyconfigs/etc/apache2/sites-available/piny b/pinyconfigs/etc/apache2/sites-available/piny index 0904ea6..0e9be04 100644 --- a/pinyconfigs/etc/apache2/sites-available/piny +++ b/pinyconfigs/etc/apache2/sites-available/piny @@ -8,6 +8,8 @@ AllowOverride None </Directory> + Alias /js /usr/share/javascript + RedirectMatch 301 ^/$ http://piny.be/piny-web/ </VirtualHost> @@ -25,6 +27,8 @@ AllowOverride None </Directory> + Alias /js /usr/share/javascript + RedirectMatch 301 ^/$ http://piny.be/piny-web/ SSLEngine On @@ -60,6 +64,7 @@ ScriptAlias /cgit /usr/lib/cgi-bin/cgit.cgi ScriptAlias /piny-newuser /usr/lib/cgi-bin/piny/newuser.cgi + ScriptAlias /piny-validate /usr/lib/cgi-bin/piny/checkconstraint.cgi ScriptAlias /auth/ /usr/lib/cgi-bin/piny/auth/ Include /etc/apache2/piny-enabled diff --git a/pinyweb/cgi-bin/checkconstraint.cgi b/pinyweb/cgi-bin/checkconstraint.cgi new file mode 100755 index 0000000..8db0903 --- /dev/null +++ b/pinyweb/cgi-bin/checkconstraint.cgi @@ -0,0 +1,41 @@ +#!/usr/bin/perl + +use strict; +use warnings; + +use CGI; +use JSON qw( encode_json ); +use Moose::Util::TypeConstraints qw( find_type_constraint ); + +use Piny; + +my $q = CGI->new( ); + +my $type = $q->param( 't' ); +my $value = $q->param( 'v' ); + +if ( not defined $type or not defined $value ) { + print "Status: 400 Bad Request\nContent-type: application/json\n\n"; + print encode_json( { "ok" => JSON::false, "msg" => "Unable to validate due to client-side error, please reload this page. Required parameter missing." } ); +} else { + + my $constraint = find_type_constraint( $type ); + + if ( not defined $constraint ) { + print "Status: 400 Bad Request\nContent-type: application/json\n\n"; + print encode_json( { "ok" => JSON::false, "msg" => "Unable to validate due to client-side error, please reload this page. Invalid constraint name." } ); + } else { + + print "Status: 200 OK\nContent-type: application/json\n\n"; + + my $error = $constraint->validate( $value ); + + if ( defined $error ) { + print encode_json( { "ok" => JSON::false, "msg" => $error } ); + } else { + print encode_json( { "ok" => JSON::true } ); + }; + + }; + +}; diff --git a/pinyweb/cgi-bin/newuser.cgi b/pinyweb/cgi-bin/newuser.cgi index 7001321..7001321 100644..100755 --- a/pinyweb/cgi-bin/newuser.cgi +++ b/pinyweb/cgi-bin/newuser.cgi diff --git a/pinyweb/debian/changelog b/pinyweb/debian/changelog index 33e7f7d..18dfcf4 100644 --- a/pinyweb/debian/changelog +++ b/pinyweb/debian/changelog @@ -1,3 +1,10 @@ +pinyweb (0.8) unstable; urgency=low + + * Depend on pinyadmin. + * Adding an AJAX CGI for live validation. + + -- Julian Blake Kongslie <jblake@omgwallhack.org> Tue, 18 Jan 2011 17:52:23 -0800 + pinyweb (0.7) unstable; urgency=low * it turns out i'm an idiot diff --git a/pinyweb/debian/control b/pinyweb/debian/control index 1a1d795..97e5537 100644 --- a/pinyweb/debian/control +++ b/pinyweb/debian/control @@ -8,7 +8,7 @@ Standards-version: 3.9.1 Package: pinyweb Architecture: any -Depends: ${perl:Depends}, ${misc:Depends}, ${shlibs:Depends}, libpiny-perl (>= 0.14) +Depends: ${perl:Depends}, ${misc:Depends}, ${shlibs:Depends}, libjson-perl, libpiny-perl (>= 0.14), pinyadmin (>= 0.10) Description: CGIs for managing piny repositories The CGI programs for day-to-day administrative tasks in the Piny infrastructure. |