don't install demo external plugins by default

diff --git a/IkiWiki/Plugin/websetup.pm b/IkiWiki/Plugin/websetup.pm
index 0a0d4480f92458c3798f8b269293eec1469d44f7..2b9240a29dd50269cc08b9a6b985fbe9a016fc8a 100644 (file)
--- 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});
 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);
 
 sub import { #{{{
        hook(type => "checkconfig", id => "websetup", call => \&checkconfig);

diff --git a/IkiWiki/Setup.pm b/IkiWiki/Setup.pm
index 73e32447c05c651eead1617ddcaaa39d650ceb96..d14be879d5f1aab1f432d46bd42f9d824e95c14a 100644 (file)
--- 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.
        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) };
        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 a805f41a244ec1d473b0e626ad04940ab608eab5..ac4ec2644b919c125b29b9b25496e3684959f930 100755 (executable)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -67,9 +67,9 @@ extra_install:
        done
        
        install -d $(DESTDIR)$(PREFIX)/lib/ikiwiki/plugins
        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; \
                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
 
        install -d $(DESTDIR)$(PREFIX)/share/man/man1
        install -m 644 ikiwiki.man $(DESTDIR)$(PREFIX)/share/man/man1/ikiwiki.1