modules/statsmaster/manifests/init.pp - Issue 5316783485485056: Issue 670 - Use GeoIP City database for AWStats

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments.

Keyboard Shortcuts

	File
u :	up to issue
m :	publish + mail comments
M :	edit review message
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line
<Enter> :	respond to / edit current comment
d :	mark current comment as done

	Issue
u :	up to list of issues
m :	publish + mail comments
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue
# :	close issue

	Comment/message editing
<Ctrl> + s or <Ctrl> + Enter :	save comment
<Esc> :	cancel edit

Side by Side Diff: modules/statsmaster/manifests/init.pp

Issue 5316783485485056: Issue 670 - Use GeoIP City database for AWStats (Closed)

Patch Set: Created June 17, 2014, 3:06 p.m.

Left:
Right:

Use n/p to move between diff chunks; N/P to move between comments.

Jump to:

View unified diff | Download patch

OLD	NEW
1 class statsmaster(	1 class statsmaster(

2 $domain,	2 $domain,

3 $certificate,	3 $certificate,

4 $private_key,	4 $private_key,

5 $is_default=false	5 $is_default=false

6 ) {	6 ) {

7	7

8 include statsmaster::downloads, statsmaster::awstats	8 include statsmaster::downloads, statsmaster::awstats

9	9

10 user {'stats':	10 user {'stats':

(...skipping 48 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
59	59

60 nginx::hostconfig{$domain:	60 nginx::hostconfig{$domain:

61 source => 'puppet:///modules/statsmaster/site.conf',	61 source => 'puppet:///modules/statsmaster/site.conf',

62 is_default => $is_default,	62 is_default => $is_default,

63 certificate => $certificate,	63 certificate => $certificate,

64 private_key => $private_key,	64 private_key => $private_key,

65 log => 'access_log_stats'	65 log => 'access_log_stats'

66 }	66 }

67	67

68 file {'/opt/cron_geoipdb_update.sh':	68 file {'/opt/cron_geoipdb_update.sh':

	69 ensure => absent,

	70 }

	71

	72 file {'/opt/cron_geoipdb_update.py':

69 ensure => file,	73 ensure => file,

70 owner => root,	74 owner => root,

71 mode => 0750,	75 mode => 0750,

72 source => 'puppet:///modules/statsmaster/cron_geoipdb_update.sh',	76 source => 'puppet:///modules/statsmaster/cron_geoipdb_update.py',

73 }	77 }

74	78

75 cron {'geoipdb_update':	79 cron {'geoipdb_update':

76 ensure => present,	80 ensure => present,

77 require => File['/opt/cron_geoipdb_update.sh'],	81 require => File['/opt/cron_geoipdb_update.py'],

78 command => '/opt/cron_geoipdb_update.sh',	82 command => '/opt/cron_geoipdb_update.py',

79 environment => ['MAILTO=admins@adblockplus.org,root'],	83 environment => ['MAILTO=admins@adblockplus.org,root'],

80 user => root,	84 user => root,

81 hour => 3,	85 hour => 3,

82 minute => 15,	86 minute => 15,

83 monthday => 3,	87 monthday => 3,

84 }	88 }

85 }	89 }

OLD	NEW