diff options
| -rw-r--r-- | IkiWiki/Plugin/websetup.pm | 5 | ||||
| -rw-r--r-- | IkiWiki/Setup.pm | 4 | ||||
| -rwxr-xr-x | Makefile.PL | 4 |
3 files changed, 7 insertions, 6 deletions
diff --git a/IkiWiki/Plugin/websetup.pm b/IkiWiki/Plugin/websetup.pm index 0a0d4480f..2b9240a29 100644 --- a/IkiWiki/Plugin/websetup.pm +++ b/IkiWiki/Plugin/websetup.pm @@ -6,7 +6,10 @@ use strict; use IkiWiki 2.00; my @rcs_plugins=(qw{git svn bzr mercurial monotone tla norcs}); -my @default_force_plugins=(qw{amazon_s3}); + +# amazon_s3 is not something that should be enabled via the web. +# external is not a standalone plugin. +my @default_force_plugins=(qw{amazon_s3 external}); sub import { #{{{ hook(type => "checkconfig", id => "websetup", call => \&checkconfig); diff --git a/IkiWiki/Setup.pm b/IkiWiki/Setup.pm index 73e32447c..d14be879d 100644 --- a/IkiWiki/Setup.pm +++ b/IkiWiki/Setup.pm @@ -77,9 +77,7 @@ sub getsetup () { #{{{ my @ret; # Load all plugins, so that all setup options are available. - # (But skip a few problematic external demo plugins.) - my @plugins=grep { ! /^(externaldemo|pythondemo|\Q$config{rcs}\E)$/ } - sort(IkiWiki::listplugins()); + my @plugins=grep { $_ ne $config{rcs} } sort(IkiWiki::listplugins()); unshift @plugins, $config{rcs} if $config{rcs}; # rcs plugin 1st foreach my $plugin (@plugins) { eval { IkiWiki::loadplugin($plugin) }; diff --git a/Makefile.PL b/Makefile.PL index a805f41a2..ac4ec2644 100755 --- a/Makefile.PL +++ b/Makefile.PL @@ -67,9 +67,9 @@ extra_install: done install -d $(DESTDIR)$(PREFIX)/lib/ikiwiki/plugins - for file in `find plugins -maxdepth 1 -type f ! -wholename plugins/.\*`; do \ + for file in `find plugins -maxdepth 1 -type f ! -wholename plugins/.\* | grep -v demo`; do \ cp -a $$file $(DESTDIR)$(PREFIX)/lib/ikiwiki/plugins; \ - done; \ + done \ install -d $(DESTDIR)$(PREFIX)/share/man/man1 install -m 644 ikiwiki.man $(DESTDIR)$(PREFIX)/share/man/man1/ikiwiki.1 |