diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2010-01-07 11:42:13 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2010-01-07 11:42:13 -0200 |
| commit | 766e8247bde3168e29942247f8e3bee406c53eaf (patch) | |
| tree | 1dc72006f75bd632d83e5c96a386956ba508c5e6 /templates | |
| parent | 0da3c3b30108d06731ae35a918fb79f7295524b9 (diff) | |
| download | puppet-ikiwiki-766e8247bde3168e29942247f8e3bee406c53eaf.tar.gz puppet-ikiwiki-766e8247bde3168e29942247f8e3bee406c53eaf.tar.bz2 | |
Adding parameters $description, $adminuser, $adminemail and $instance
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/deploy.sh.erb | 13 | ||||
| -rw-r--r-- | templates/ikiwiki.setup.erb | 6 |
2 files changed, 10 insertions, 9 deletions
diff --git a/templates/deploy.sh.erb b/templates/deploy.sh.erb index 66c0f10..69785d0 100644 --- a/templates/deploy.sh.erb +++ b/templates/deploy.sh.erb @@ -1,14 +1,15 @@ #!/bin/bash NAME="$1" +INSTANCE="$2" BASE="<%= apache_sites_folder %>" SITE=$BASE/$NAME CONF="/etc/ikiwiki" OWNER="gitosis" GROUP="gitosis" -if [ -z "$NAME" ]; then - echo "Usage:`basename $0` <site>" +if [ -z "$INSTANCE" ]; then + echo "Usage:`basename $0` <site> <instance>" fi if [ ! -e "$CONF/$NAME" ]; then @@ -16,10 +17,10 @@ if [ ! -e "$CONF/$NAME" ]; then fi # Setup source folder -mkdir -p $SITE/ikiwiki_src/ +mkdir -p $SITE/"$INSTANCE"_src/ # Create initial page -echo > $SITE/ikiwiki_src/index.mdw <<EOF +echo > $SITE/"$INSTANCE"_src/index.mdw <<EOF Welcome to your new wiki. All wikis are supposed to have a [[SandBox]], so this one does too. @@ -30,10 +31,10 @@ This wiki is powered by [ikiwiki](http://ikiwiki.info). EOF # Create ikiwiki instance -ikiwiki-makerepo git $SITE/ikiwiki_src/ /var/git/repositories/$NAME.git +ikiwiki-makerepo git $SITE/"$INSTANCE"_src/ /var/git/repositories/$NAME.git touch /var/git/repositories/$NAME.git/git-daemon-export-ok ( cd /var/git/repositories/$NAME.git && git --bare update-server-info ) ikiwiki --setup /etc/ikiwiki/$NAME.setup # Set permissions -chown -R $OWNER.$GROUP $SITE/ikiwiki_src $SITE/ikiwiki /var/git/repositories/$NAME.git +chown -R $OWNER.$GROUP $SITE/"$INSTANCE"_src $SITE/$INSTANCE /var/git/repositories/$NAME.git diff --git a/templates/ikiwiki.setup.erb b/templates/ikiwiki.setup.erb index c42a7e3..dae8047 100644 --- a/templates/ikiwiki.setup.erb +++ b/templates/ikiwiki.setup.erb @@ -6,9 +6,9 @@ # Remember to re-run ikiwiki --setup any time you edit this file. use IkiWiki::Setup::Standard { - wikiname => "<%= name %>", - #adminuser => ["yourname", ], - adminemail => 'me@example.org', + wikiname => "<%= desc %>", + adminuser => ["<%= adminuser %>", ], + adminemail => '<%= adminemail %>', # Be sure to customise these.. srcdir => "<%= apache_sites_folder %>/<%= name %>/ikiwiki_src", |