]> sipb.mit.edu Git - ikiwiki.git/commitdiff
Merge commit 'schmonz/master' into cvs
authorJoey Hess <joey@gnu.kitenet.net>
Fri, 4 Sep 2009 21:16:28 +0000 (17:16 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Fri, 4 Sep 2009 21:16:28 +0000 (17:16 -0400)
Conflicts:
IkiWiki/Plugin/cvs.pm

IkiWiki/Plugin/cvs.pm
IkiWiki/Plugin/rsync.pm [deleted file]
IkiWiki/Plugin/unixauth.pm [deleted file]
doc/plugins/contrib/cvs.mdwn
doc/plugins/contrib/cvs/discussion.mdwn

index 8409bebedb4cd4bb26b4119c674a673ec38a5886..2c2445f399068ac43824c2b1b8291982b68e60a0 100644 (file)
@@ -61,7 +61,7 @@ sub getsetup () {
                cvs_wrapper => {
                        type => "string",
                        example => "/cvs/wikirepo/CVSROOT/post-commit",
-                       description => "cvs post-commit hook to generate (triggered by CVSROOT/loginfo entry",
+                       description => "cvs post-commit hook to generate (triggered by CVSROOT/loginfo entry)",
                        safe => 0, # file
                        rebuild => 0,
                },
@@ -221,11 +221,13 @@ sub rcs_add ($) {
                        if (defined($filemime) && $filemime eq 'text/plain') {
                                cvs_runcvs('add', $file) ||
                                        warn("cvs add $file failed\n");
-                       } else {
+                       }
+                       else {
                                cvs_runcvs('add', '-kb', $file) ||
                                        warn("cvs add binary $file failed\n");
                        }
-               } else {
+               }
+               else {
                        # directory
                        cvs_runcvs('add', $file) ||
                                warn("cvs add $file failed\n");
@@ -339,7 +341,8 @@ sub rcs_recentchanges($) {
                    $message[0]->{line}=~/$config{web_commit_regexp}/) {
                        $user=defined $2 ? "$2" : "$3";
                        $message[0]->{line}=$4;
-               } else {
+               }
+               else {
                        $committype="cvs";
                }
 
@@ -349,21 +352,24 @@ sub rcs_recentchanges($) {
                $line = <SPSVC>;
                if ($line =~ /^Author: (.*)$/) {
                        $user = $1 unless defined $user && length $user;
-               } else {
+               }
+               else {
                        error "expected Author, got $line";
                }
 
                $line = <SPSVC>;
                if ($line =~ /^Date: (.*)$/) {
                        $when = str2time($1, 'UTC');
-               } else {
+               }
+               else {
                        error "expected Date, got $line";
                }
 
                $line = <SPSVC>;
                if ($line =~ /^PatchSet (.*)$/) {
                        $rev = $1;
-               } else {
+               }
+               else {
                        error "expected PatchSet, got $line";
                }
 
@@ -401,7 +407,8 @@ sub rcs_diff ($) {
 
        if (wantarray) {
                return @cvsps;
-       } else {
+       }
+       else {
                return join("", @cvsps);
        }
 }
diff --git a/IkiWiki/Plugin/rsync.pm b/IkiWiki/Plugin/rsync.pm
deleted file mode 100644 (file)
index 3f04945..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/usr/bin/perl
-package IkiWiki::Plugin::rsync;
-
-use warnings;
-use strict;
-use IkiWiki 3.00;
-
-sub import {
-       hook(type => "getsetup", id => "rsync", call => \&getsetup);
-       hook(type => "checkconfig", id => "rsync", call => \&checkconfig);
-       hook(type => "postrefresh", id => "rsync", call => \&postrefresh);
-}
-
-sub getsetup () {
-       return
-               plugin => {
-                       safe => 0,
-                       rebuild => 0,
-               },
-               rsync_command => {
-                       type => "string",
-                       example => "rsync -qa --delete /path/to/destdir/ user\@host:/path/to/docroot/",
-                       description => "unattended command to upload regenerated pages",
-                       safe => 0,
-                       rebuild => 0,
-               },
-}
-
-sub checkconfig {
-       if (! exists $config{rsync_command} ||
-           ! defined $config{rsync_command}) {
-               error("Must specify rsync_command");
-       }
-}
-
-sub postrefresh () {
-       system $config{rsync_command};
-       if ($? == -1) {
-               error("failed to execute rsync_command: $!");
-       } elsif ($? != 0) {
-               error(sprintf("rsync_command exited %d", $? >> 8));
-       }
-}
-
-1
diff --git a/IkiWiki/Plugin/unixauth.pm b/IkiWiki/Plugin/unixauth.pm
deleted file mode 100644 (file)
index 4f0cb4d..0000000
+++ /dev/null
@@ -1,195 +0,0 @@
-#!/usr/bin/perl
-# Ikiwiki unixauth authentication.
-package IkiWiki::Plugin::unixauth;
-
-use warnings;
-use strict;
-use IkiWiki 2.00;
-
-sub import {
-       hook(type => "getsetup", id => "unixauth", call => \&getsetup);
-               hook(type => "formbuilder_setup", id => "unixauth",
-                       call => \&formbuilder_setup);
-               hook(type => "formbuilder", id => "unixauth",
-                       call => \&formbuilder);
-       hook(type => "sessioncgi", id => "unixauth", call => \&sessioncgi);
-}
-
-sub getsetup () {
-       return
-       unixauth_type => {
-                       type => "string",
-                       example => "checkpassword",
-                       description => "type of authenticator; can be 'checkpassword' or 'pwauth'",
-                       safe => 0,
-                       rebuild => 1,
-       },
-       unixauth_command => {
-                       type => "string",
-                       example => "/path/to/checkpassword",
-                       description => "full path and any arguments",
-                       safe => 0,
-                       rebuild => 1,
-       },
-       unixauth_requiressl => {
-                       type => "boolean",
-                       example => "1",
-                       description => "require SSL? strongly recommended",
-                       safe => 0,
-                       rebuild => 1,
-       },
-       plugin => {
-                       description => "Unix user authentication",
-                       safe => 0,
-                       rebuild => 1,
-       },
-}
-
-# Checks if a string matches a user's password, and returns true or false.
-sub checkpassword ($$;$) {
-       my $user=shift;
-       my $password=shift;
-       my $field=shift || "password";
-
-       # It's very important that the user not be allowed to log in with
-       # an empty password!
-       if (! length $password) {
-                       return 0;
-       }
-
-       my $ret=0;
-       if (! exists $config{unixauth_type}) {
-                       # admin needs to carefully think over his configuration
-                       return 0;
-       }
-       elsif ($config{unixauth_type} eq "checkpassword") {
-                       open UNIXAUTH, "|$config{unixauth_command} true 3<&0" or die("Could not run $config{unixauth_type}");
-                       print UNIXAUTH "$user\0$password\0Y123456\0";
-                       close UNIXAUTH;
-                       $ret=!($?>>8);
-       }
-       elsif ($config{unixauth_type} eq "pwauth") {
-                       open UNIXAUTH, "|$config{unixauth_command}" or die("Could not run $config{unixauth_type}");
-                       print UNIXAUTH "$user\n$password\n";
-                       close UNIXAUTH;
-                       $ret=!($?>>8);
-       }
-       else {
-                       # no such authentication type
-                       return 0;
-       }
-
-       if ($ret) {
-               my $userinfo=IkiWiki::userinfo_retrieve();
-               if (! length $user || ! defined $userinfo ||
-                       ! exists $userinfo->{$user} || ! ref $userinfo->{$user}) {
-                               IkiWiki::userinfo_setall($user, {
-                                       'email' => '',
-                                       'regdate' => time,
-                               });
-               }
-       }
-
-       return $ret;
-}
-
-sub formbuilder_setup (@) {
-       my %params=@_;
-
-       my $form=$params{form};
-       my $session=$params{session};
-       my $cgi=$params{cgi};
-
-       # if not under SSL, die before even showing a login form,
-       # unless the admin explicitly says it's fine
-       if (! exists $config{unixauth_requiressl}) {
-                       $config{unixauth_requiressl} = 1;
-       }
-       if ($config{unixauth_requiressl}) {
-               if ((! $config{sslcookie}) || (! exists $ENV{'HTTPS'})) {
-                       die("SSL required to login. Contact your administrator.<br>");
-               }
-       }
-
-       if ($form->title eq "signin") {
-                       $form->field(name => "name", required => 0);
-                       $form->field(name => "password", type => "password", required => 0);
-
-                       if ($form->submitted) {
-                                       my $submittype=$form->submitted;
-                                       # Set required fields based on how form was submitted.
-                                       my %required=(
-                                                       "Login" => [qw(name password)],
-                                       );
-                                       foreach my $opt (@{$required{$submittype}}) {
-                                                       $form->field(name => $opt, required => 1);
-                                       }
-
-                                       # Validate password against name for Login.
-                                       if ($submittype eq "Login") {
-                                                       $form->field(
-                                                                       name => "password",
-                                                                       validate => sub {
-                                                                                       checkpassword($form->field("name"), shift);
-                                                                       },
-                                                       );
-                                       }
-
-                                       # XXX is this reachable? looks like no
-                                       elsif ($submittype eq "Login") {
-                                                       $form->field(
-                                                                       name => "name",
-                                                                       validate => sub {
-                                                                                       my $name=shift;
-                                                                                       length $name &&
-                                                                                       IkiWiki::userinfo_get($name, "regdate");
-                                                                       },
-                                                       );
-                                       }
-                       }
-                       else {
-                                       # First time settings.
-                                       $form->field(name => "name");
-                                       if ($session->param("name")) {
-                                                       $form->field(name => "name", value => $session->param("name"));
-                                       }
-                       }
-       }
-       elsif ($form->title eq "preferences") {
-               $form->field(name => "name", disabled => 1,
-                               value => $session->param("name"), force => 1,
-                               fieldset => "login");
-               $form->field(name => "password", disabled => 1, type => "password",
-                               fieldset => "login"),
-       }
-}
-
-sub formbuilder (@) {
-       my %params=@_;
-
-       my $form=$params{form};
-       my $session=$params{session};
-       my $cgi=$params{cgi};
-       my $buttons=$params{buttons};
-
-       if ($form->title eq "signin") {
-               if ($form->submitted && $form->validate) {
-                       if ($form->submitted eq 'Login') {
-                               $session->param("name", $form->field("name"));
-                               IkiWiki::cgi_postsignin($cgi, $session);
-                       }
-               }
-       }
-       elsif ($form->title eq "preferences") {
-               if ($form->submitted eq "Save Preferences" && $form->validate) {
-                       my $user_name=$form->field('name');
-               }
-       }
-}
-
-sub sessioncgi ($$) {
-       my $q=shift;
-       my $session=shift;
-}
-
-1
index 1c43fb272cfd0d7dd98da968da9221300bbe2168..fcf5b936f926e19d70d82794666cdbc7dc463838 100644 (file)
@@ -5,8 +5,8 @@
 This plugin allows ikiwiki to use [[!wikipedia desc="CVS" Concurrent Versions System]] as an [[rcs]].
 
 ### Usage
-7. Install [cvsps](http://www.cobite.com/cvsps/), [[!cpan IPC::Cmd]],
-[[!cpan String::ShellQuote]], [[!cpan File::ReadBackwards]], and
+7. Install [cvsps](http://www.cobite.com/cvsps/), [[!cpan
+File::ReadBackwards]], and
 [cvsweb](http://www.freebsd.org/projects/cvsweb.html) or the like.
 7. Adjust CVS-related parameters in your setup file.
 
index b5f03ac6f45a32282aec9417a2cc0cfa676be99c..1f0ce010211cd7a77eadf7bf563ba6dfd0cc7163 100644 (file)
@@ -122,3 +122,6 @@ to run the command, with stderr temporarily sent to /dev/null:
 `cvs_runcvs` should not take an array reference. It's
 usual for this type of function to take a list of parameters
 to pass to the command.
+
+> Thanks for reading carefully. I've tested your suggestions and
+> applied them on my branch. --[[schmonz]]