Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Delta Between Two Patch Sets: modules/adblockplus/manifests/web/mimeo.pp

Issue 29504594: #2687 - Include mimeo python module (Closed)
Left Patch Set: For comment 38 Created Aug. 20, 2017, 11:51 p.m.
Right Patch Set: For comments 47 and 48 Created Aug. 22, 2017, 8:33 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« no previous file with change/comment | « modules/adblockplus/files/mimeo.py ('k') | modules/adblockplus/templates/mimeo.service.erb » ('j') | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
1 # == Class: adblockplus::web::mimeo 1 # == Class: adblockplus::web::mimeo
2 # 2 #
3 # Class adblockplus::web::mimeo registers the information received in a 3 # Class adblockplus::web::mimeo registers the information received in a
4 # http/s petition with an specified format in an specific output. 4 # http/s petition with an specified format in an specific output.
5 # 5 #
6 # === Parameters: 6 # === Parameters:
7 # 7 #
8 # [*format*] 8 # [*format*]
9 # A string containing the desired format for logging. 9 # A string containing the desired format for logging.
10 # 10 #
11 # '$remote_addr - - [$time_local] "$request" $status $bytes_sent "$http_refere r"' 11 # '$remote_addr - - [$time_local] "$request" $status $bytes_sent "$http_refere r"'
12 # 12 #
13 # [*port*] 13 # [*port*]
14 # An integer to setup the port where the script will be listening, defaults 14 # An integer to setup the port where the script will be listening, defaults
15 # to 8000. 15 # to 8000.
16 # 16 #
17 # [*response*] 17 # [*response*]
18 # A string (like format parameter) representing the response sent to the 18 # A string (like format parameter) representing the response sent to the
19 # client. 19 # client.
20 # 20 #
21 # [*output*]
22 # A string containg the path to the file where the logs will be written.
23 # the special char `-` represents stdout.
24 #
25 class adblockplus::web::mimeo ( 21 class adblockplus::web::mimeo (
26 $format = '', 22 $format = '',
27 $port = 8000, 23 $port = 8000,
28 $response = '', 24 $response = '',
29 $output = '-',
mathias 2017/08/21 07:37:42 With that one being the default now, how exactly c
f.lopez 2017/08/21 19:54:12 Done.
30 ){ 25 ){
26 include adblockplus
31 27
32 ensure_packages(['python3']) 28 ensure_packages(['python3'])
33 29
34 file {"/usr/local/bin/mimeo.py": 30 realize(File['/var/adblockplus'])
31
32 file {'/var/adblockplus/mimeo':
33 ensure => 'directory',
34 mode => '0755',
35 owner => 'root',
36 require => File['/var/adblockplus'],
37 }
38
39 file {'/usr/local/bin/mimeo.py':
35 ensure => 'present', 40 ensure => 'present',
36 owner => 'root', 41 owner => 'root',
37 group => 'root', 42 group => 'root',
38 mode => 0755, 43 mode => 0755,
39 source => 'puppet:///modules/adblockplus/mimeo.py', 44 source => 'puppet:///modules/adblockplus/mimeo.py',
40 require => Package['python3'], 45 require => Package['python3'],
41 } 46 }
42 47
43 file {"/etc/systemd/system/mimeo.service": 48 file {'/etc/systemd/system/mimeo.service':
44 ensure => 'present', 49 ensure => 'present',
45 owner => 'root', 50 owner => 'root',
46 group => 'root', 51 group => 'root',
47 mode => 0644, 52 mode => 0644,
48 content => template('adblockplus/mimeo.service.erb'), 53 content => template('adblockplus/mimeo.service.erb'),
49 require => File['/usr/local/bin/mimeo.py'], 54 require => File['/usr/local/bin/mimeo.py'],
50 } 55 }
51 56
52 Exec{ 57 Exec{
53 path => ['/usr/bin', '/bin'], 58 path => ['/usr/bin', '/bin'],
54 } 59 }
55 60
56 exec {"enable-service-mimeo": 61 exec {'enable-service-mimeo':
57 command => 'systemctl enable mimeo.service', 62 command => 'systemctl enable mimeo.service',
58 user => 'root', 63 user => 'root',
59 unless => 'systemctl is-enabled mimeo.service', 64 unless => 'systemctl is-enabled mimeo.service',
60 require => File["/etc/systemd/system/mimeo.service"], 65 require => File['/etc/systemd/system/mimeo.service'],
61 } 66 }
62 67
63 service {"mimeo": 68 service {'mimeo':
64 ensure => 'running', 69 ensure => 'running',
65 hasrestart => false, 70 hasrestart => false,
66 provider => 'systemd', 71 provider => 'systemd',
67 require => Exec["enable-service-mimeo"], 72 require => Exec['enable-service-mimeo'],
73 subscribe => File['/usr/local/bin/mimeo.py'],
68 } 74 }
69 75
70 exec {"reload-mimeo-daemon": 76 exec {'reload-mimeo-daemon':
71 notify => Service['mimeo'], 77 notify => Service['mimeo'],
72 command => 'systemctl daemon-reload', 78 command => 'systemctl daemon-reload',
73 subscribe => [ 79 subscribe => File['/etc/systemd/system/mimeo.service'],
74 File["/etc/systemd/system/mimeo.service"],
75 File["/usr/local/bin/mimeo.py"],
mathias 2017/08/21 07:37:42 Why should changing the Python script require a da
f.lopez 2017/08/21 19:54:12 Done.
76 ],
77 refreshonly => true, 80 refreshonly => true,
78 } 81 }
79 } 82 }
80 83
LEFTRIGHT

Powered by Google App Engine
This is Rietveld