From cd440bfd3d6e20146e77e1d6c0e9f579687ca2ab Mon Sep 17 00:00:00 2001
From: "jrayhawk+piny.be@omgwallhack.org" <jrayhawk+piny.be@omgwallhack.org>
Date: Fri, 12 Apr 2013 19:46:04 -0700
Subject: libpiny: add piny.reloadapache configuration variable
---
libpiny/lib/Piny/Config.pm | 1 +
libpiny/lib/Piny/Repo.pm | 4 +++-
2 files changed, 4 insertions(+), 1 deletion(-)
(limited to 'libpiny/lib')
diff --git a/libpiny/lib/Piny/Config.pm b/libpiny/lib/Piny/Config.pm
index ec86955..eb78a0f 100644
--- a/libpiny/lib/Piny/Config.pm
+++ b/libpiny/lib/Piny/Config.pm
@@ -265,6 +265,7 @@ 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 41987c5..a735a16 100644
--- a/libpiny/lib/Piny/Repo.pm
+++ b/libpiny/lib/Piny/Repo.pm
@@ -330,7 +330,9 @@ 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: $!";
- system( "/etc/init.d/apache2", "reload" ) and die "Could not reload apache config!";
+ if ( $s->config->piny_reloadapache =~ /^(1|true)$/ ) {
+ system( "/etc/init.d/apache2", "reload" ) and die "Could not reload apache config!";
+ };
};
sub rebuild_ikiwiki {
--
cgit v1.2.3