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

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

Issue 29338036: Issue 3574 - Move APT setup from class base to module adblockplus (Closed)
Patch Set: Created March 9, 2016, 7:30 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
« no previous file with comments | « no previous file | modules/base/manifests/init.pp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # == Class: adblockplus 1 # == Class: adblockplus
2 # 2 #
3 # The adblockplus class and the associated adblockplus:: namespace are 3 # The adblockplus class and the associated adblockplus:: namespace are
4 # used to integrate Puppet modules with each other, in order to assemble 4 # used to integrate Puppet modules with each other, in order to assemble
5 # the setups used by the Adblock Plus project. 5 # the setups used by the Adblock Plus project.
6 # 6 #
7 # === Parameters: 7 # === Parameters:
8 # 8 #
9 # [*authority*] 9 # [*authority*]
10 # The authorative domain or zone associated with the current environment, 10 # The authorative domain or zone associated with the current environment,
(...skipping 16 matching lines...) Expand all
27 class adblockplus ( 27 class adblockplus (
28 $authority = hiera('adblockplus::authority', 'adblockplus.org'), 28 $authority = hiera('adblockplus::authority', 'adblockplus.org'),
29 $users = hiera_hash('adblockplus::users', {}), 29 $users = hiera_hash('adblockplus::users', {}),
30 ) { 30 ) {
31 31
32 # See https://issues.adblockplus.org/ticket/3574#comment:8 32 # See https://issues.adblockplus.org/ticket/3574#comment:8
33 class {'base': 33 class {'base':
34 zone => $authority, 34 zone => $authority,
35 } 35 }
36 36
37 # Class['apt'] cannot yet be configured to update on-demand
38 class {'apt':
39 always_apt_update => ($enfironment != 'development'),
40 }
41
37 # Used as internal constant within adblockplus::* resources 42 # Used as internal constant within adblockplus::* resources
38 $directory = '/var/adblockplus' 43 $directory = '/var/adblockplus'
39 44
40 # A common location for directories specific to the adblockplus:: setups, 45 # A common location for directories specific to the adblockplus:: setups,
41 # managed via Puppet, but accessible by all users with access to the system 46 # managed via Puppet, but accessible by all users with access to the system
42 @file {$directory: 47 @file {$directory:
43 ensure => 'directory', 48 ensure => 'directory',
44 mode => 0755, 49 mode => 0755,
45 owner => 'root', 50 owner => 'root',
46 } 51 }
(...skipping 21 matching lines...) Expand all
68 '/etc/ssh/ssh_host_rsa_key': 73 '/etc/ssh/ssh_host_rsa_key':
69 source => 'puppet:///modules/adblockplus/development_host_rsa_key', 74 source => 'puppet:///modules/adblockplus/development_host_rsa_key',
70 mode => 600, 75 mode => 600,
71 notify => Service['ssh']; 76 notify => Service['ssh'];
72 '/etc/ssh/ssh_host_rsa_key.pub': 77 '/etc/ssh/ssh_host_rsa_key.pub':
73 source => 'puppet:///modules/adblockplus/development_host_rsa_key.pub', 78 source => 'puppet:///modules/adblockplus/development_host_rsa_key.pub',
74 mode => 644; 79 mode => 644;
75 } 80 }
76 } 81 }
77 82
83 # Fix implicit package dependency Class['apt'] does not properly handle
84 Exec['apt_update'] -> Package<|title != 'python-software-properties'|>
85
78 # See modules/adblockplus/manifests/user.pp 86 # See modules/adblockplus/manifests/user.pp
79 create_resources('adblockplus::user', $users) 87 create_resources('adblockplus::user', $users)
80 } 88 }
OLDNEW
« no previous file with comments | « no previous file | modules/base/manifests/init.pp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld