From ab1be769ff42199b2deefd9f8318c759a7aa40ec Mon Sep 17 00:00:00 2001
From: "jrayhawk+piny.be@omgwallhack.org" <jrayhawk+piny.be@omgwallhack.org>
Date: Fri, 12 Apr 2013 19:48:28 -0700
Subject: libpiny: renaming reloadapache to apachereload
---
libpiny/lib/Piny/Config.pm | 2 +-
libpiny/lib/Piny/Repo.pm | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
(limited to 'libpiny/lib')
diff --git a/libpiny/lib/Piny/Config.pm b/libpiny/lib/Piny/Config.pm
index eb78a0f..0f02921 100644
--- a/libpiny/lib/Piny/Config.pm
+++ b/libpiny/lib/Piny/Config.pm
@@ -259,13 +259,13 @@ tweakable "piny_template" => undef, 'Maybe[PathDir]', 'inhibit';
tweakable "piny_gitpath" => '/srv/git', 'PathDir';
# Repo-specific tweakables, in the repos' .git/config files.
+tweakable "piny_apachereload" => "true", 'GitBool';
tweakable "piny_ikiwiki" => "true", 'GitBool';
tweakable "piny_ikiwikidestdir" => "/srv/www/piny.be/", 'PathDir';
tweakable "piny_ikiwikisrcdir" => "/srv/ikiwiki/", 'PathDir';
tweakable "piny_ikiwikiurl" => "http://piny.be/", 'HttpUrl';
tweakable "piny_ikiwikisecureurl" => "https://secure.piny.be/", 'HttpsUrl';
tweakable "piny_ikiwikisecurepath" => "/srv/www/secure.piny.be/", 'PathDir';
-tweakable "piny_reloadapache" => "true", 'GitBool';
tweakable "core_sharedrepository" => '0664', 'RepoPermission';
tweakable "receive_denynonfastforwards" => "true", 'GitBool';
tweakable "receive_denydeletes" => "true", 'GitBool';
diff --git a/libpiny/lib/Piny/Repo.pm b/libpiny/lib/Piny/Repo.pm
index a735a16..3376ea7 100644
--- a/libpiny/lib/Piny/Repo.pm
+++ b/libpiny/lib/Piny/Repo.pm
@@ -330,7 +330,7 @@ sub rebuild_apache {
$wwwtemp->close or die "Could not close new wikilist: $!";
rename( $wwwtemp->filename, "/etc/apache2/piny/www/" . $s->name ) or die "Could not rename apache config: $!";
- if ( $s->config->piny_reloadapache =~ /^(1|true)$/ ) {
+ if ( $s->config->piny_apachereload =~ /^(1|true)$/ ) {
system( "/etc/init.d/apache2", "reload" ) and die "Could not reload apache config!";
};
};
--
cgit v1.2.3