rename

diff --git a/Makefile.PL b/Makefile.PL
index 04ed70502876024c205d8e2f2141b792ced2b0e7..a805f41a244ec1d473b0e626ad04940ab608eab5 100755 (executable)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -50,7 +50,7 @@ extra_clean:
 extra_install:
        install -d $(DESTDIR)/etc/ikiwiki
        install -m 0644 wikilist $(DESTDIR)/etc/ikiwiki
 extra_install:
        install -d $(DESTDIR)/etc/ikiwiki
        install -m 0644 wikilist $(DESTDIR)/etc/ikiwiki

-       install -m 0644 simple.setup $(DESTDIR)/etc/ikiwiki
+       install -m 0644 auto.setup $(DESTDIR)/etc/ikiwiki

 
        install -d $(DESTDIR)$(PREFIX)/share/ikiwiki
        for dir in `cd underlays && find . -follow -type d ! -regex '.*\.svn.*'`; do \
 
        install -d $(DESTDIR)$(PREFIX)/share/ikiwiki
        for dir in `cd underlays && find . -follow -type d ! -regex '.*\.svn.*'`; do \

diff --git a/auto.setup b/auto.setup
new file mode 100644 (file)
index 0000000..38514d5
--- /dev/null
+++ b/auto.setup
@@ -0,0 +1,43 @@
+#!/usr/bin/perl
+# Ikiwiki setup automator.
+# 
+# This setup file causes ikiwiki to create a wiki, check it into revision
+# control, generate a setup file for the new wiki, and set everything up.
+#
+# Just run: ikiwiki -setup /etc/ikiwiki/simple.setup
+#
+# By default, it asks a few questions, and confines itself to the user's home
+# directory. You can edit it to change what it asks questions about, or to
+# modify the values to use site-specific settings.
+
+require IkiWiki::Setup::Automator;
+
+our $wikiname=IkiWiki::Setup::Automator::ask(
+       "What will the wiki be named?", "wiki");
+our $rcs=IkiWiki::Setup::Automator::ask(
+       "What revision control system to use?", "git");
+our $admin=IkiWiki::Setup::Automator::ask(
+       "What wiki user (or openid) will be wiki admin?", $ENV{USER});
+our $hostname=`hostname -f`; chomp $hostname;
+
+IkiWiki::Setup::Automator->import(
+       wikiname => $wikiname,
+       adminuser => [$admin],
+       rcs => $rcs,
+       srcdir => "$ENV{HOME}/$wikiname",
+       destdir => "$ENV{HOME}/public_html/$wikiname",
+       repository => "$ENV{HOME}/$wikiname.$rcs",
+       dumpsetup => "$ENV{HOME}/$wikiname.setup",
+       url => "http://$hostname/~$ENV{USER}/$wikiname",
+       cgiurl => "http://$hostname/~$ENV{USER}/$wikiname/ikiwiki.cgi",
+       cgi_wrapper => "$ENV{HOME}/public_html/$wikiname/ikiwiki.cgi",
+       adminemail => "$ENV{USER}\@$hostname",
+       add_plugins => [qw{ goodstuff }],
+       disable_plugins => [qw{  }],
+       libdir => "$ENV{HOME}/.ikiwiki",
+       rss => 1,
+       atom => 1,
+       syslog => 1,
+       prefix_directives => 1,
+       hardlink => 1,
+)

diff --git a/debian/changelog b/debian/changelog
index 865544786ae7f91e44b3db8f1eac0d6392ce2b9e..7b4bc42156d94d11ea1590fda10f383676fc01b7 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
 ikiwiki (2.60) UNRELEASED; urgency=low
  
 ikiwiki (2.60) UNRELEASED; urgency=low
  

-  * Starting with this version, "ikiwiki -setup /etc/ikiwiki/simple.setup"
+  * Starting with this version, "ikiwiki -setup /etc/ikiwiki/auto.setup"

     can be used set up a new wiki in seconds.
   * Add getsetup hook, all plugins that add fields to %config should use it.
   * ikiwiki --dumpsetup can generate a nice setup file snapshotting ikiwiki's
     can be used set up a new wiki in seconds.
   * Add getsetup hook, all plugins that add fields to %config should use it.
   * ikiwiki --dumpsetup can generate a nice setup file snapshotting ikiwiki's

diff --git a/doc/setup.mdwn b/doc/setup.mdwn
index 09ca550384f90f59466e1acbd0d2bdc49707f2a2..2989485f9af926d6c91688a91e6612dec214dc97 100644 (file)
--- a/doc/setup.mdwn
+++ b/doc/setup.mdwn
@@ -12,7 +12,7 @@ If you're not, see the [[download]] and [[install]] pages.
 If you'd like to set up a wiki now, and learn more later, just run this command
 and answer a couple of questions.
 
 If you'd like to set up a wiki now, and learn more later, just run this command
 and answer a couple of questions.
 

-       % ikiwiki -setup /etc/ikiwiki/simple.setup
+       % ikiwiki -setup /etc/ikiwiki/auto.setup

        What will the wiki be named? mywiki
        What revision control system to use? git
        What wiki user (or openid) will be wiki admin? joey
        What will the wiki be named? mywiki
        What revision control system to use? git
        What wiki user (or openid) will be wiki admin? joey

diff --git a/simple.setup b/simple.setup
deleted file mode 100644 (file)
index 60934b5..0000000
--- a/simple.setup
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/usr/bin/perl
-# Simple ikiwiki setup.
-# 
-# This setup file causes ikiwiki to create a wiki, check it into revision
-# control, generate a setup file for the new wiki, and set everything up.
-#
-# Just run: ikiwiki -setup /etc/ikiwiki/simple.setup
-#
-# By default, it asks a few questions, and confines itself to the user's home
-# directory. You can edit it to change what it asks questions about, or to
-# modify the values to use site-specific settings.
-
-require IkiWiki::Setup::Automator;
-
-our $wikiname=IkiWiki::Setup::Automator::ask(
-       "What will the wiki be named?", "wiki");
-our $rcs=IkiWiki::Setup::Automator::ask(
-       "What revision control system to use?", "git");
-our $admin=IkiWiki::Setup::Automator::ask(
-       "What wiki user (or openid) will be wiki admin?", $ENV{USER});
-our $hostname=`hostname -f`; chomp $hostname;
-
-IkiWiki::Setup::Automator->import(
-       wikiname => $wikiname,
-       adminuser => [$admin],
-       rcs => $rcs,
-       srcdir => "$ENV{HOME}/$wikiname",
-       destdir => "$ENV{HOME}/public_html/$wikiname",
-       repository => "$ENV{HOME}/$wikiname.$rcs",
-       dumpsetup => "$ENV{HOME}/$wikiname.setup",
-       url => "http://$hostname/~$ENV{USER}/$wikiname",
-       cgiurl => "http://$hostname/~$ENV{USER}/$wikiname/ikiwiki.cgi",
-       cgi_wrapper => "$ENV{HOME}/public_html/$wikiname/ikiwiki.cgi",
-       adminemail => "$ENV{USER}\@$hostname",
-       add_plugins => [qw{ goodstuff }],
-       disable_plugins => [qw{  }],
-       libdir => "$ENV{HOME}/.ikiwiki",
-       rss => 1,
-       atom => 1,
-       syslog => 1,
-       prefix_directives => 1,
-       hardlink => 1,
-);