[D-community-commits] r85 - in trunk/fai-config-dir: doc files
files/etc/apache2/apache2.conf
files/etc/apache2/sites-available/debian-community.org
files/home files/home/ikiwiki files/home/ikiwiki/.ikiwiki
files/home/ikiwiki/.ikiwiki/ikiwiki.setup scripts/WEBSERVER
Holger Levsen
h01ger-guest at alioth.debian.org
Thu Mar 29 00:58:14 CET 2007
Author: h01ger-guest
Date: 2007-03-28 23:58:14 +0000 (Wed, 28 Mar 2007)
New Revision: 85
Added:
trunk/fai-config-dir/files/home/
trunk/fai-config-dir/files/home/ikiwiki/
trunk/fai-config-dir/files/home/ikiwiki/.ikiwiki/
trunk/fai-config-dir/files/home/ikiwiki/.ikiwiki/ikiwiki.setup/
trunk/fai-config-dir/files/home/ikiwiki/.ikiwiki/ikiwiki.setup/WEBSERVER
trunk/fai-config-dir/scripts/WEBSERVER/11-ikiwiki
Modified:
trunk/fai-config-dir/doc/manual_adminwork.txt
trunk/fai-config-dir/files/etc/apache2/apache2.conf/WEBSERVER
trunk/fai-config-dir/files/etc/apache2/sites-available/debian-community.org/WEBSERVER
trunk/fai-config-dir/scripts/WEBSERVER/10-ikiwiki
Log:
- setup ikiwiki
Modified: trunk/fai-config-dir/doc/manual_adminwork.txt
===================================================================
--- trunk/fai-config-dir/doc/manual_adminwork.txt 2007-03-28 23:43:31 UTC (rev 84)
+++ trunk/fai-config-dir/doc/manual_adminwork.txt 2007-03-28 23:58:14 UTC (rev 85)
@@ -29,3 +29,26 @@
# compare the fingerprint with a fingerprint on machine with a trust path
gpg --export -a A70DAF536070D3A1 | apt-key add -
+7. created a ssh-key for ikiwiki user (for ikiwiki-svn commits to alioth):
+
+bikeshed:~# su - ikiwiki
+ikiwiki at bikeshed:~$ ssh-keygen
+Generating public/private rsa key pair.
+Enter file in which to save the key (/home/ikiwiki/.ssh/id_rsa):
+Enter passphrase (empty for no passphrase):
+Enter same passphrase again:
+Your identification has been saved in /home/ikiwiki/.ssh/id_rsa.
+Your public key has been saved in /home/ikiwiki/.ssh/id_rsa.pub.
+The key fingerprint is:
+2a:f8:40:a1:76:b0:de:a0:5d:9c:0a:32:b8:f2:3b:9a ikiwiki at bikeshed
+
+8. checked out wiki working copy for ikiwiki user:
+
+ikiwiki at bikeshed:~$ svn co svn+ssh://d-community-guest@svn.debian.org/svn/d-community/trunk/wiki
+Password:
+Password:
+Password:
+A wiki/index.mdwn
+Checked out revision 83.
+ikiwiki at bikeshed:~$
+
Modified: trunk/fai-config-dir/files/etc/apache2/apache2.conf/WEBSERVER
===================================================================
--- trunk/fai-config-dir/files/etc/apache2/apache2.conf/WEBSERVER 2007-03-28 23:43:31 UTC (rev 84)
+++ trunk/fai-config-dir/files/etc/apache2/apache2.conf/WEBSERVER 2007-03-28 23:58:14 UTC (rev 85)
@@ -117,7 +117,7 @@
StartServers 2
MaxClients 150
MinSpareThreads 3
- MaxSpareThreads 8
+ MaxSpareThreads 5
ThreadsPerChild 10
MaxRequestsPerChild 0
</IfModule>
@@ -509,7 +509,7 @@
# To use CGI scripts outside of ScriptAliased directories:
# (You will also need to add "ExecCGI" to the "Options" directive.)
#
- #AddHandler cgi-script .cgi
+ AddHandler cgi-script .cgi
#
# For files that include their own HTTP headers:
Modified: trunk/fai-config-dir/files/etc/apache2/sites-available/debian-community.org/WEBSERVER
===================================================================
--- trunk/fai-config-dir/files/etc/apache2/sites-available/debian-community.org/WEBSERVER 2007-03-28 23:43:31 UTC (rev 84)
+++ trunk/fai-config-dir/files/etc/apache2/sites-available/debian-community.org/WEBSERVER 2007-03-28 23:58:14 UTC (rev 85)
@@ -1,26 +1,17 @@
-NameVirtualHost *
<VirtualHost bikeshed.debian-community.org>
ServerAdmin webmaster at debian-community.org
DocumentRoot /srv/www/
- <Directory />
- Options FollowSymLinks
- AllowOverride None
- </Directory>
<Directory /srv/www/>
- Options Indexes FollowSymLinks MultiViews
+ Options Indexes FollowSymLinks MultiViews +ExecCGI
AllowOverride None
Order allow,deny
allow from all
</Directory>
- ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/
- <Directory "/usr/lib/cgi-bin">
- AllowOverride None
- Options ExecCGI -MultiViews +SymLinksIfOwnerMatch
- Order allow,deny
- Allow from all
- </Directory>
+# <Directory "/srv/www/cgi-bin/">
+# Options +ExecCGI
+# </Directory>
ErrorLog /var/log/apache2/error.log
Added: trunk/fai-config-dir/files/home/ikiwiki/.ikiwiki/ikiwiki.setup/WEBSERVER
===================================================================
--- trunk/fai-config-dir/files/home/ikiwiki/.ikiwiki/ikiwiki.setup/WEBSERVER 2007-03-28 23:43:31 UTC (rev 84)
+++ trunk/fai-config-dir/files/home/ikiwiki/.ikiwiki/ikiwiki.setup/WEBSERVER 2007-03-28 23:58:14 UTC (rev 85)
@@ -0,0 +1,94 @@
+#!/usr/bin/perl
+# Configuration file for ikiwiki.
+# Passing this to ikiwiki --setup will make ikiwiki generate wrappers and
+# build the wiki.
+#
+# Remember to re-run ikiwiki --setup any time you edit this file.
+
+use IkiWiki::Setup::Standard {
+ wikiname => "debian-community.org wiki",
+ adminuser => ["Holger Levsen", ],
+ adminemail => 'holger at layer-acht.org',
+
+ # Be sure to customise these..
+ srcdir => "/home/ikiwiki/wiki",
+ destdir => "/srv/www",
+
+ url => "http://bikeshed.debian-community.org",
+ cgiurl => "http://bikeshed.debian-community.org/ikiwiki.cgi",
+ #templatedir => "/usr/share/ikiwiki/templates",
+ #underlaydir => "/usr/share/ikiwiki/basewiki",
+
+ # Subversion stuff.
+ rcs => "svn",
+ historyurl => "http://svn.debian.org/wsvn/trunk/wiki/[[file]]",
+ diffurl => "http://svn.debian.org/wsvn/trunk/wiki[[file]]?root=wiki&r1=[[r1]]&r2=[[r2]]",
+ #svnrepo => "/svn/wiki",
+ #svnpath => "trunk",
+
+ wrappers => [
+ {
+ # The cgi wrapper.
+ cgi => 1,
+ wrapper => "/srv/www/ikiwiki.cgi",
+ wrappermode => "06755",
+ },
+ #{
+ # # The svn post-commit wrapper.
+ # # Note that this will overwrite any existing
+ # # post-commit hook script, which may not be
+ # # what you want.
+ # wrapper => "/svn/wikirepo/hooks/post-commit",
+ # wrappermode => "04755",
+ # # Enable mail notifications of commits.
+ # notify => 1,
+ #},
+ ],
+
+ # Generate rss feeds for blogs?
+ rss => 1,
+ # Generate atom feeds for blogs?
+ atom => 1,
+ # Urls to ping with XML-RPC when rss feeds are updated
+ #pingurl => [qw{http://rpc.technorati.com/rpc/ping}],
+ # Include discussion links on all pages?
+ discussion => 1,
+ # To exclude files matching a regexp from processing. This adds to
+ # the default exclude list.
+ #exclude => qr/*\.wav/,
+ # Time format (for strftime)
+ #timeformat => '%c',
+ # Locale to use. Must be a UTF-8 locale.
+ #locale => 'en_US.UTF-8',
+ # Only send cookies over SSL connections.
+ #sslcookie => 1,
+ # Logging settings:
+ verbose => 0,
+ syslog => 0,
+ # To link to user pages in a subdirectory of the wiki.
+ #userdir => "users",
+
+ # To add plugins, list them here.
+ #add_plugins => [qw{goodstuff openid search wikitext camelcase
+ # htmltidy fortune sidebar map rst anonok}],
+ # If you want to disable any of the default plugins, list them here.
+ #disable_plugins => [qw{inline htmlscrubber passwordauth}],
+
+ # For use with the tag plugin, make all tags be located under a
+ # base page.
+ #tagbase => "tag",
+
+ # For use with the search plugin if your estseek.cgi is located
+ # somewhere else.
+ #estseek => "/usr/lib/estraier/estseek.cgi",
+
+ # For use with the openid plugin, to give an url to a page users
+ # can use to signup for an OpenID.
+ #openidsignup => "http://myopenid.com/",
+
+ # For use with the mirrorlist plugin, a list of mirrors.
+ #mirrorlist => {
+ # mirror1 => "http://hostname1",
+ # mirror2 => "http://hostname2/mirror",
+ #},
+}
Modified: trunk/fai-config-dir/scripts/WEBSERVER/10-ikiwiki
===================================================================
--- trunk/fai-config-dir/scripts/WEBSERVER/10-ikiwiki 2007-03-28 23:43:31 UTC (rev 84)
+++ trunk/fai-config-dir/scripts/WEBSERVER/10-ikiwiki 2007-03-28 23:58:14 UTC (rev 85)
@@ -6,3 +6,17 @@
#
mkdir -p $target/srv/www
+
+user=ikiwiki
+$ROOTCMD addgroup --quiet --system ikiwiki
+$ROOTCMD adduser --quiet --system --disabled-password --shell /bin/bash --gecos "" --ingroup ikiwiki ikiwiki
+$ROOTCMD mkdir -p /home/ikiwiki/.ssh /home/ikiwiki/.ikiwiki
+$ROOTCMD touch /home/ikiwiki/.ssh/authorized_keys
+$ROOTCMD chown -R ikiwiki.ikiwiki /home/ikiwiki/.ssh
+$ROOTCMD chmod 700 /home/ikiwiki/.ssh
+
+$ROOTCMD chown ikiwiki.ikiwiki $target/srv/www $target/home/ikiwiki/.ikiwiki
+fcopy -m ikiwiki.ikiwiki,755 /home/ikiwiki/.ikiwiki/ikiwiki.setup
+
+# for cgi-support
+$ROOTCMD ln -sf /etc/apache2/mods-available/cgi.load /etc/apache2/mods-enabled/
Added: trunk/fai-config-dir/scripts/WEBSERVER/11-ikiwiki
===================================================================
--- trunk/fai-config-dir/scripts/WEBSERVER/11-ikiwiki 2007-03-28 23:43:31 UTC (rev 84)
+++ trunk/fai-config-dir/scripts/WEBSERVER/11-ikiwiki 2007-03-28 23:58:14 UTC (rev 85)
@@ -0,0 +1,16 @@
+#! /usr/sbin/cfagent -f
+
+control:
+ any::
+ actionsequence = ( files directories editfiles )
+ EditFileSize = ( 30000 )
+
+files:
+ any::
+
+editfiles:
+ any::
+ { ${target}/etc/ikiwiki/wikilist
+ AppendIfNoSuchLine 'ikiwiki /home/ikiwiki/.ikiwiki/ikiwiki.setup'
+ }
+
Property changes on: trunk/fai-config-dir/scripts/WEBSERVER/11-ikiwiki
___________________________________________________________________
Name: svn:executable
+ *
More information about the D-community-commits
mailing list