6
6
path => ' /usr/bin' ,
7
7
}
8
8
9
+ include https
10
+
11
+ class https {
12
+ package { [' apt-transport-https' ]:
13
+ ensure => installed,
14
+ }
15
+ }
16
+
9
17
include jissues
10
18
11
19
class jissues {
33
41
}
34
42
}
35
43
36
- include dotdeb
44
+ include suryphp
37
45
38
- class dotdeb {
39
- exec { 'get-dotdeb ' :
40
- command => ' wget https://www.dotdeb.org/dotdeb .gpg && apt-key add dotdeb .gpg'
46
+ class suryphp {
47
+ exec { 'get-suryphp ' :
48
+ command => ' wget -O /etc/apt/trusted.gpg.d/suryphp .gpg https://packages.sury.org/php/ apt.gpg'
41
49
}
42
50
43
- file { '/etc/apt/sources.list.d/dotdeb .list' :
51
+ file { '/etc/apt/sources.list.d/suryphp .list' :
44
52
ensure => present ,
45
- source => ' /vagrant/build/puppet/files/etc/dotdeb .list' ,
53
+ source => ' /vagrant/build/puppet/files/etc/suryphp .list' ,
46
54
owner => ' root' ,
47
55
group => ' root' ;
48
56
}
49
57
50
58
exec { 'update-cache' :
51
59
command => ' aptitude update' ,
52
- require => File [' /etc/apt/sources.list.d/dotdeb .list' ]
60
+ require => File [' /etc/apt/sources.list.d/suryphp .list' ]
53
61
}
54
62
}
55
63
105
113
106
114
class php {
107
115
package { [
108
- ' php7.0 ' ,
109
- ' php7.0 -mysql' ,
110
- ' php7.0 -curl' ,
111
- ' php7.0 -xdebug' ,
112
- ' php7.0 -cli' ,
113
- ' php7.0 -intl'
116
+ ' php7.1 ' ,
117
+ ' php7.1 -mysql' ,
118
+ ' php7.1 -curl' ,
119
+ ' php7.1 -xdebug' ,
120
+ ' php7.1 -cli' ,
121
+ ' php7.1 -intl'
114
122
]:
115
123
ensure => installed,
116
124
require => Exec[update-cache]
117
125
}
118
126
119
- file { '/etc/php/7.0/apache2/conf.d/98-xdebug.ini' :
127
+ file { '/etc/php/7.1/apache2/conf.d/10-mysqli.ini' :
128
+ ensure => ' link' ,
129
+ require => Package[' php7.1' ],
130
+ target => ' /etc/php/7.1/mods-available/mysqli.ini' ,
131
+ before => Service[' apache2' ],
132
+ }
133
+
134
+ file { '/etc/php/7.1/apache2/conf.d/98-xdebug.ini' :
120
135
ensure => present ,
121
- require => Package[' php7.0' ],
122
- source => ' /vagrant/build/puppet/files/php/xdebug.ini' ;
136
+ require => Package[' php7.1' ],
137
+ source => ' /vagrant/build/puppet/files/php/xdebug.ini' ,
138
+ before => Service[' apache2' ],
123
139
}
124
140
125
- file { '/etc/php/7.0 /apache2/conf.d/99-php.ini' :
141
+ file { '/etc/php/7.1 /apache2/conf.d/99-php.ini' :
126
142
ensure => present ,
127
- require => Package[' php7.0' ],
128
- source => ' /vagrant/build/puppet/files/php/php.ini' ;
143
+ require => Package[' php7.1' ],
144
+ source => ' /vagrant/build/puppet/files/php/php.ini' ,
145
+ before => Service[' apache2' ],
129
146
}
130
147
}
0 commit comments