Skip to content

Commit 6d49e1d

Browse files
committedJan 5, 2012
Remove awstats. Also some modperl cleanup in WRE::Site.
1 parent 4118a05 commit 6d49e1d

File tree

4 files changed

+0
-1518
lines changed

4 files changed

+0
-1518
lines changed
 

‎wre/lib/WRE/Site.pm

-17
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,6 @@ sub create {
119119
);
120120

121121
# create webroot
122-
$file->makePath($wreConfig->getDomainRoot('/'.$sitename.'/awstats'));
123122
$file->makePath($wreConfig->getDomainRoot('/'.$sitename.'/logs'));
124123
$file->makePath($wreConfig->getDomainRoot('/'.$sitename.'/public'));
125124
my $uploads = $wreConfig->getDomainRoot('/'.$sitename.'/public/uploads/');
@@ -128,16 +127,6 @@ sub create {
128127
$wreConfig->getDomainRoot('/'.$sitename.'/public/uploads/'),
129128
{ recursive => 1, force=>1 });
130129

131-
# create awstats config
132-
$file->copy($wreConfig->getRoot("/var/awstats.template"),
133-
$wreConfig->getRoot("/etc/awstats.".$sitename.".conf"),
134-
{ templateVars => $params, force => 1 });
135-
136-
# create modperl config
137-
$file->copy($wreConfig->getRoot("/var/modperl.template"),
138-
$wreConfig->getRoot("/etc/".$sitename.".modperl"),
139-
{ templateVars => $params, force => 1 });
140-
141130
# create nginx config
142131
$file->copy($wreConfig->getRoot("/var/nginx.template"),
143132
$wreConfig->getRoot("/etc/".$sitename.".nginx"),
@@ -279,12 +268,6 @@ sub delete {
279268
# web root
280269
$file->delete($wreConfig->getDomainRoot("/".$sitename));
281270

282-
# awstats
283-
$file->delete($wreConfig->getRoot("/etc/awstats.".$sitename.".conf"));
284-
285-
# modperl
286-
$file->delete($wreConfig->getRoot("/etc/".$sitename.".modperl"));
287-
288271
# nginx
289272
$file->delete($wreConfig->getRoot("/etc/".$sitename.".nginx"));
290273

‎wre/sbin/wreconsole.pl

-21
Original file line numberDiff line numberDiff line change
@@ -762,19 +762,6 @@ sub www_editSite {
762762
<textarea name="modperl">'.$$contents.'</textarea><br />
763763
<input type="submit" class="saveButton" value="Save" /> <br /><br />
764764
';
765-
$$contents = '';
766-
eval { $contents = $file->slurp($state->{config}->getRoot("/etc/awstats.".$sitename.".conf")) };
767-
if ($@) {
768-
carp "Couldn't open awstats.$sitename.conf file for editing $@";
769-
$content .= '<div class="status">'.$@.'</div>';
770-
}
771-
makeHtmlFormSafe($contents);
772-
$content .= '
773-
<div><b>awstats.'.$sitename.'.conf</b></div>
774-
<textarea name="awstats">'.$$contents.'</textarea><br />
775-
<input type="submit" class="saveButton" value="Save" />
776-
</form>
777-
';
778765
sendResponse($state, $content);
779766
}
780767

@@ -805,11 +792,6 @@ sub www_editSiteSave {
805792
$status = "Couldn't save $sitename.modperl. $@";
806793
carp $status;
807794
}
808-
eval { $file->spit($state->{config}->getRoot("/etc/awstats.".$sitename.".conf"), $state->{cgi}->param("awstats")) };
809-
if ($@) {
810-
$status = "Couldn't save awstats.$sitename.conf. $@";
811-
carp $status;
812-
}
813795
www_listSites($state, $status);
814796
}
815797

@@ -1263,9 +1245,6 @@ sub www_setup {
12631245
$file->copy($config->getRoot("/var/setupfiles/nginx.template"),
12641246
$config->getRoot("/var/nginx.template"),
12651247
{ force => 1 });
1266-
$file->copy($config->getRoot("/var/setupfiles/awstats.template"),
1267-
$config->getRoot("/var/awstats.template"),
1268-
{ force => 1 });
12691248
$file->copy($config->getRoot("/var/setupfiles/wre.logrotate"),
12701249
$config->getRoot("/var/wre.logrotate"),
12711250
{ force => 1 });

‎wre/var/setupfiles/awstats.template

-1,471
This file was deleted.

‎wre/var/setupfiles/stats.modproxy

-9
This file was deleted.

0 commit comments

Comments
 (0)
Please sign in to comment.