freighthop 0.2.1 → 0.3.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (322) hide show
  1. data/Puppetfile +4 -3
  2. data/Puppetfile.lock +14 -2
  3. data/Vagrantfile +5 -1
  4. data/data/common.json +4 -3
  5. data/freighthop.gemspec +1 -1
  6. data/lib/freighthop/cli/checks.rb +12 -0
  7. data/lib/freighthop/cli/help.rb +7 -0
  8. data/lib/freighthop/cli/init.rb +35 -0
  9. data/lib/freighthop/cli/ssh.rb +1 -0
  10. data/lib/freighthop/cli/vagrant.rb +1 -0
  11. data/lib/freighthop/cli.rb +5 -17
  12. data/lib/freighthop/config.rb +5 -1
  13. data/lib/freighthop/version.rb +1 -1
  14. data/lib/freighthop.rb +6 -1
  15. data/local_modules/freighthop/manifests/database/mysql/grant.pp +11 -0
  16. data/local_modules/freighthop/manifests/database/mysql.pp +5 -15
  17. data/local_modules/freighthop/manifests/database/postgres.pp +2 -2
  18. data/local_modules/freighthop/manifests/database.pp +3 -3
  19. data/local_modules/freighthop/manifests/init.pp +6 -23
  20. data/local_modules/freighthop/manifests/language/ruby.pp +5 -25
  21. data/local_modules/freighthop/manifests/language.pp +1 -4
  22. data/local_modules/freighthop/manifests/packages.pp +2 -12
  23. data/local_modules/freighthop/manifests/params.pp +19 -11
  24. data/local_modules/freighthop/manifests/web/apache.pp +60 -0
  25. data/local_modules/freighthop/manifests/web/nginx.pp +22 -0
  26. data/local_modules/freighthop/manifests/web/ssl.pp +13 -0
  27. data/local_modules/freighthop/manifests/web.pp +25 -21
  28. data/local_modules/freighthop/templates/apache/passenger.conf.erb +18 -0
  29. data/local_modules/freighthop/templates/nginx/vagrant-rails.conf.erb +5 -3
  30. data/modules/apache/CHANGELOG.md +172 -0
  31. data/modules/apache/CONTRIBUTING.md +234 -0
  32. data/modules/apache/Gemfile +25 -0
  33. data/modules/apache/LICENSE +15 -0
  34. data/modules/apache/Modulefile +12 -0
  35. data/modules/apache/README.md +1515 -0
  36. data/modules/apache/README.passenger.md +93 -0
  37. data/modules/apache/Rakefile +1 -0
  38. data/modules/apache/files/httpd +24 -0
  39. data/modules/apache/lib/puppet/provider/a2mod/a2mod.rb +35 -0
  40. data/modules/apache/lib/puppet/provider/a2mod/gentoo.rb +116 -0
  41. data/modules/apache/lib/puppet/provider/a2mod/modfix.rb +12 -0
  42. data/modules/apache/lib/puppet/provider/a2mod/redhat.rb +60 -0
  43. data/modules/apache/lib/puppet/provider/a2mod.rb +34 -0
  44. data/modules/apache/lib/puppet/type/a2mod.rb +30 -0
  45. data/modules/apache/manifests/balancer.pp +80 -0
  46. data/modules/apache/manifests/balancermember.pp +52 -0
  47. data/modules/apache/manifests/confd/no_accf.pp +10 -0
  48. data/modules/apache/manifests/default_confd_files.pp +12 -0
  49. data/modules/apache/manifests/default_mods/load.pp +8 -0
  50. data/modules/apache/manifests/default_mods.pp +108 -0
  51. data/modules/apache/manifests/dev.pp +11 -0
  52. data/modules/apache/manifests/init.pp +329 -0
  53. data/modules/apache/manifests/listen.pp +9 -0
  54. data/modules/apache/manifests/mod/alias.pp +17 -0
  55. data/modules/apache/manifests/mod/auth_basic.pp +3 -0
  56. data/modules/apache/manifests/mod/auth_kerb.pp +5 -0
  57. data/modules/apache/manifests/mod/authnz_ldap.pp +19 -0
  58. data/modules/apache/manifests/mod/autoindex.pp +12 -0
  59. data/modules/apache/manifests/mod/cache.pp +3 -0
  60. data/modules/apache/manifests/mod/cgi.pp +4 -0
  61. data/modules/apache/manifests/mod/cgid.pp +23 -0
  62. data/modules/apache/manifests/mod/dav.pp +3 -0
  63. data/modules/apache/manifests/mod/dav_fs.pp +20 -0
  64. data/modules/apache/manifests/mod/dav_svn.pp +5 -0
  65. data/modules/apache/manifests/mod/deflate.pp +12 -0
  66. data/modules/apache/manifests/mod/dev.pp +5 -0
  67. data/modules/apache/manifests/mod/dir.pp +21 -0
  68. data/modules/apache/manifests/mod/disk_cache.pp +24 -0
  69. data/modules/apache/manifests/mod/event.pp +54 -0
  70. data/modules/apache/manifests/mod/expires.pp +3 -0
  71. data/modules/apache/manifests/mod/fastcgi.pp +24 -0
  72. data/modules/apache/manifests/mod/fcgid.pp +3 -0
  73. data/modules/apache/manifests/mod/headers.pp +3 -0
  74. data/modules/apache/manifests/mod/include.pp +3 -0
  75. data/modules/apache/manifests/mod/info.pp +14 -0
  76. data/modules/apache/manifests/mod/itk.pp +64 -0
  77. data/modules/apache/manifests/mod/ldap.pp +12 -0
  78. data/modules/apache/manifests/mod/mime.pp +21 -0
  79. data/modules/apache/manifests/mod/mime_magic.pp +14 -0
  80. data/modules/apache/manifests/mod/negotiation.pp +12 -0
  81. data/modules/apache/manifests/mod/nss.pp +25 -0
  82. data/modules/apache/manifests/mod/passenger.pp +38 -0
  83. data/modules/apache/manifests/mod/perl.pp +3 -0
  84. data/modules/apache/manifests/mod/peruser.pp +73 -0
  85. data/modules/apache/manifests/mod/php.pp +26 -0
  86. data/modules/apache/manifests/mod/prefork.pp +74 -0
  87. data/modules/apache/manifests/mod/proxy.pp +15 -0
  88. data/modules/apache/manifests/mod/proxy_ajp.pp +4 -0
  89. data/modules/apache/manifests/mod/proxy_balancer.pp +10 -0
  90. data/modules/apache/manifests/mod/proxy_html.pp +28 -0
  91. data/modules/apache/manifests/mod/proxy_http.pp +4 -0
  92. data/modules/apache/manifests/mod/python.pp +5 -0
  93. data/modules/apache/manifests/mod/reqtimeout.pp +12 -0
  94. data/modules/apache/manifests/mod/rewrite.pp +4 -0
  95. data/modules/apache/manifests/mod/rpaf.pp +20 -0
  96. data/modules/apache/manifests/mod/setenvif.pp +12 -0
  97. data/modules/apache/manifests/mod/ssl.pp +26 -0
  98. data/modules/apache/manifests/mod/status.pp +42 -0
  99. data/modules/apache/manifests/mod/suphp.pp +14 -0
  100. data/modules/apache/manifests/mod/userdir.pp +17 -0
  101. data/modules/apache/manifests/mod/vhost_alias.pp +3 -0
  102. data/modules/apache/manifests/mod/worker.pp +75 -0
  103. data/modules/apache/manifests/mod/wsgi.pp +21 -0
  104. data/modules/apache/manifests/mod/xsendfile.pp +4 -0
  105. data/modules/apache/manifests/mod.pp +120 -0
  106. data/modules/apache/manifests/namevirtualhost.pp +9 -0
  107. data/modules/apache/manifests/package.pp +48 -0
  108. data/modules/apache/manifests/params.pp +207 -0
  109. data/modules/apache/manifests/peruser/multiplexer.pp +17 -0
  110. data/modules/apache/manifests/peruser/processor.pp +17 -0
  111. data/modules/apache/manifests/php.pp +18 -0
  112. data/modules/apache/manifests/proxy.pp +15 -0
  113. data/modules/apache/manifests/python.pp +18 -0
  114. data/modules/apache/manifests/service.pp +35 -0
  115. data/modules/apache/manifests/ssl.pp +18 -0
  116. data/modules/apache/manifests/vhost.pp +516 -0
  117. data/modules/apache/spec/acceptance/basic_spec.rb +12 -0
  118. data/modules/apache/spec/acceptance/class_spec.rb +58 -0
  119. data/modules/apache/spec/acceptance/default_mods_spec.rb +97 -0
  120. data/modules/apache/spec/acceptance/itk_spec.rb +35 -0
  121. data/modules/apache/spec/acceptance/mod_php_spec.rb +52 -0
  122. data/modules/apache/spec/acceptance/mod_suphp_spec.rb +44 -0
  123. data/modules/apache/spec/acceptance/nodesets/centos-64-x64.yml +8 -0
  124. data/modules/apache/spec/acceptance/nodesets/default.yml +8 -0
  125. data/modules/apache/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml +8 -0
  126. data/modules/apache/spec/acceptance/nodesets/vagrant.key +27 -0
  127. data/modules/apache/spec/acceptance/prefork_worker_spec.rb +81 -0
  128. data/modules/apache/spec/acceptance/service_spec.rb +19 -0
  129. data/modules/apache/spec/acceptance/vhost_spec.rb +290 -0
  130. data/modules/apache/spec/classes/apache_spec.rb +464 -0
  131. data/modules/apache/spec/classes/dev_spec.rb +38 -0
  132. data/modules/apache/spec/classes/mod/auth_kerb_spec.rb +41 -0
  133. data/modules/apache/spec/classes/mod/authnz_ldap_spec.rb +65 -0
  134. data/modules/apache/spec/classes/mod/dav_svn_spec.rb +41 -0
  135. data/modules/apache/spec/classes/mod/dev_spec.rb +23 -0
  136. data/modules/apache/spec/classes/mod/dir_spec.rb +88 -0
  137. data/modules/apache/spec/classes/mod/event_spec.rb +17 -0
  138. data/modules/apache/spec/classes/mod/fastcgi_spec.rb +32 -0
  139. data/modules/apache/spec/classes/mod/fcgid_spec.rb +41 -0
  140. data/modules/apache/spec/classes/mod/info_spec.rb +99 -0
  141. data/modules/apache/spec/classes/mod/itk_spec.rb +31 -0
  142. data/modules/apache/spec/classes/mod/mime_magic_spec.rb +93 -0
  143. data/modules/apache/spec/classes/mod/passenger_spec.rb +112 -0
  144. data/modules/apache/spec/classes/mod/perl_spec.rb +41 -0
  145. data/modules/apache/spec/classes/mod/peruser_spec.rb +17 -0
  146. data/modules/apache/spec/classes/mod/php_spec.rb +99 -0
  147. data/modules/apache/spec/classes/mod/prefork_spec.rb +47 -0
  148. data/modules/apache/spec/classes/mod/proxy_html_spec.rb +45 -0
  149. data/modules/apache/spec/classes/mod/python_spec.rb +41 -0
  150. data/modules/apache/spec/classes/mod/rpaf_spec.rb +77 -0
  151. data/modules/apache/spec/classes/mod/ssl_spec.rb +53 -0
  152. data/modules/apache/spec/classes/mod/status_spec.rb +166 -0
  153. data/modules/apache/spec/classes/mod/suphp_spec.rb +27 -0
  154. data/modules/apache/spec/classes/mod/worker_spec.rb +44 -0
  155. data/modules/apache/spec/classes/mod/wsgi_spec.rb +54 -0
  156. data/modules/apache/spec/classes/params_spec.rb +21 -0
  157. data/modules/apache/spec/classes/service_spec.rb +109 -0
  158. data/modules/apache/spec/defines/mod_spec.rb +105 -0
  159. data/modules/apache/spec/defines/vhost_spec.rb +1152 -0
  160. data/modules/apache/spec/fixtures/modules/site_apache/templates/fake.conf.erb +1 -0
  161. data/modules/apache/spec/spec.opts +4 -0
  162. data/modules/apache/spec/spec_helper.rb +1 -0
  163. data/modules/apache/spec/spec_helper_acceptance.rb +27 -0
  164. data/modules/apache/spec/unit/provider/a2mod/gentoo_spec.rb +184 -0
  165. data/modules/apache/templates/confd/no-accf.conf.erb +4 -0
  166. data/modules/apache/templates/httpd.conf.erb +92 -0
  167. data/modules/apache/templates/listen.erb +6 -0
  168. data/modules/apache/templates/mod/alias.conf.erb +9 -0
  169. data/modules/apache/templates/mod/authnz_ldap.conf.erb +5 -0
  170. data/modules/apache/templates/mod/autoindex.conf.erb +56 -0
  171. data/modules/apache/templates/mod/cgid.conf.erb +1 -0
  172. data/modules/apache/templates/mod/dav_fs.conf.erb +1 -0
  173. data/modules/apache/templates/mod/deflate.conf.erb +4 -0
  174. data/modules/apache/templates/mod/dir.conf.erb +1 -0
  175. data/modules/apache/templates/mod/disk_cache.conf.erb +8 -0
  176. data/modules/apache/templates/mod/event.conf.erb +9 -0
  177. data/modules/apache/templates/mod/fastcgi.conf.erb +6 -0
  178. data/modules/apache/templates/mod/info.conf.erb +6 -0
  179. data/modules/apache/templates/mod/itk.conf.erb +8 -0
  180. data/modules/apache/templates/mod/ldap.conf.erb +7 -0
  181. data/modules/apache/templates/mod/mime.conf.erb +36 -0
  182. data/modules/apache/templates/mod/mime_magic.conf.erb +1 -0
  183. data/modules/apache/templates/mod/mpm_event.conf.erb +9 -0
  184. data/modules/apache/templates/mod/negotiation.conf.erb +2 -0
  185. data/modules/apache/templates/mod/nss.conf.erb +228 -0
  186. data/modules/apache/templates/mod/passenger.conf.erb +30 -0
  187. data/modules/apache/templates/mod/peruser.conf.erb +12 -0
  188. data/modules/apache/templates/mod/php5.conf.erb +30 -0
  189. data/modules/apache/templates/mod/prefork.conf.erb +8 -0
  190. data/modules/apache/templates/mod/proxy.conf.erb +23 -0
  191. data/modules/apache/templates/mod/proxy_html.conf.erb +24 -0
  192. data/modules/apache/templates/mod/reqtimeout.conf.erb +2 -0
  193. data/modules/apache/templates/mod/rpaf.conf.erb +15 -0
  194. data/modules/apache/templates/mod/setenvif.conf.erb +34 -0
  195. data/modules/apache/templates/mod/ssl.conf.erb +24 -0
  196. data/modules/apache/templates/mod/status.conf.erb +12 -0
  197. data/modules/apache/templates/mod/suphp.conf.erb +19 -0
  198. data/modules/apache/templates/mod/userdir.conf.erb +19 -0
  199. data/modules/apache/templates/mod/worker.conf.erb +9 -0
  200. data/modules/apache/templates/mod/wsgi.conf.erb +13 -0
  201. data/modules/apache/templates/namevirtualhost.erb +8 -0
  202. data/modules/apache/templates/ports_header.erb +5 -0
  203. data/modules/apache/templates/vhost/_aliases.erb +12 -0
  204. data/modules/apache/templates/vhost/_block.erb +10 -0
  205. data/modules/apache/templates/vhost/_custom_fragment.erb +5 -0
  206. data/modules/apache/templates/vhost/_directories.erb +143 -0
  207. data/modules/apache/templates/vhost/_error_document.erb +7 -0
  208. data/modules/apache/templates/vhost/_fastcgi.erb +18 -0
  209. data/modules/apache/templates/vhost/_itk.erb +28 -0
  210. data/modules/apache/templates/vhost/_php_admin.erb +12 -0
  211. data/modules/apache/templates/vhost/_proxy.erb +20 -0
  212. data/modules/apache/templates/vhost/_rack.erb +7 -0
  213. data/modules/apache/templates/vhost/_redirect.erb +12 -0
  214. data/modules/apache/templates/vhost/_requestheader.erb +10 -0
  215. data/modules/apache/templates/vhost/_rewrite.erb +40 -0
  216. data/modules/apache/templates/vhost/_scriptalias.erb +24 -0
  217. data/modules/apache/templates/vhost/_serveralias.erb +7 -0
  218. data/modules/apache/templates/vhost/_setenv.erb +12 -0
  219. data/modules/apache/templates/vhost/_ssl.erb +41 -0
  220. data/modules/apache/templates/vhost/_suphp.erb +11 -0
  221. data/modules/apache/templates/vhost/_wsgi.erb +15 -0
  222. data/modules/apache/templates/vhost.conf.erb +63 -0
  223. data/modules/apache/tests/apache.pp +6 -0
  224. data/modules/apache/tests/dev.pp +1 -0
  225. data/modules/apache/tests/init.pp +1 -0
  226. data/modules/apache/tests/mod_load_params.pp +11 -0
  227. data/modules/apache/tests/mods.pp +9 -0
  228. data/modules/apache/tests/mods_custom.pp +16 -0
  229. data/modules/apache/tests/php.pp +4 -0
  230. data/modules/apache/tests/vhost.pp +237 -0
  231. data/modules/apache/tests/vhost_directories.pp +30 -0
  232. data/modules/apache/tests/vhost_ip_based.pp +25 -0
  233. data/modules/apache/tests/vhost_ssl.pp +23 -0
  234. data/modules/apache/tests/vhosts_without_listen.pp +53 -0
  235. data/modules/freighthop/manifests/database/mysql/grant.pp +11 -0
  236. data/modules/freighthop/manifests/database/mysql.pp +5 -15
  237. data/modules/freighthop/manifests/database/postgres.pp +2 -2
  238. data/modules/freighthop/manifests/database.pp +3 -3
  239. data/modules/freighthop/manifests/init.pp +6 -23
  240. data/modules/freighthop/manifests/language/ruby.pp +5 -25
  241. data/modules/freighthop/manifests/language.pp +1 -4
  242. data/modules/freighthop/manifests/packages.pp +2 -12
  243. data/modules/freighthop/manifests/params.pp +19 -11
  244. data/modules/freighthop/manifests/web/apache.pp +60 -0
  245. data/modules/freighthop/manifests/web/nginx.pp +22 -0
  246. data/modules/freighthop/manifests/web/ssl.pp +13 -0
  247. data/modules/freighthop/manifests/web.pp +25 -21
  248. data/modules/freighthop/templates/apache/passenger.conf.erb +18 -0
  249. data/modules/freighthop/templates/nginx/vagrant-rails.conf.erb +5 -3
  250. data/modules/rbenv/AUTHORS +11 -0
  251. data/modules/rbenv/CHANGELOG.md +70 -0
  252. data/modules/rbenv/Gemfile +5 -10
  253. data/modules/rbenv/Gemfile.lock +16 -58
  254. data/modules/rbenv/Modulefile +7 -7
  255. data/modules/rbenv/README.md +156 -20
  256. data/modules/rbenv/Rakefile +18 -24
  257. data/modules/rbenv/TODO +10 -0
  258. data/modules/rbenv/bin/autospec +16 -0
  259. data/modules/rbenv/bin/facter +16 -0
  260. data/modules/rbenv/bin/filebucket +16 -0
  261. data/modules/rbenv/bin/hiera +16 -0
  262. data/modules/rbenv/bin/htmldiff +16 -0
  263. data/modules/rbenv/bin/ldiff +16 -0
  264. data/modules/rbenv/bin/pi +16 -0
  265. data/modules/rbenv/bin/puppet +16 -0
  266. data/modules/rbenv/bin/puppet-lint +16 -0
  267. data/modules/rbenv/bin/puppet-module +16 -0
  268. data/modules/rbenv/bin/puppetca +16 -0
  269. data/modules/rbenv/bin/puppetd +16 -0
  270. data/modules/rbenv/bin/puppetdoc +16 -0
  271. data/modules/rbenv/bin/puppetmasterd +16 -0
  272. data/modules/rbenv/bin/puppetqd +16 -0
  273. data/modules/rbenv/bin/puppetrun +16 -0
  274. data/modules/rbenv/bin/rake +16 -0
  275. data/modules/rbenv/bin/ralsh +16 -0
  276. data/modules/rbenv/bin/rspec +16 -0
  277. data/modules/rbenv/bin/rspec-puppet-init +16 -0
  278. data/modules/rbenv/lib/puppet/provider/rbenvgem/default.rb +50 -0
  279. data/modules/rbenv/lib/puppet/type/rbenvgem.rb +62 -0
  280. data/modules/rbenv/manifests/bundle.pp +36 -0
  281. data/modules/rbenv/manifests/client.pp +48 -0
  282. data/modules/rbenv/manifests/compile.pp +102 -0
  283. data/modules/rbenv/manifests/definition.pp +31 -0
  284. data/modules/rbenv/manifests/dependencies/centos.pp +25 -0
  285. data/modules/rbenv/manifests/dependencies/suse.pp +28 -0
  286. data/modules/rbenv/manifests/dependencies/ubuntu.pp +17 -0
  287. data/modules/rbenv/manifests/dependencies.pp +8 -0
  288. data/modules/rbenv/manifests/gem.pp +29 -0
  289. data/modules/rbenv/manifests/install.pp +55 -0
  290. data/modules/rbenv/manifests/plugin/rbenvvars.pp +16 -0
  291. data/modules/rbenv/manifests/plugin/rubybuild.pp +16 -0
  292. data/modules/rbenv/manifests/plugin.pp +40 -0
  293. data/modules/rbenv/metadata.json +99 -31
  294. data/modules/rbenv/spec/classes/dependencies_spec.rb +20 -0
  295. data/modules/rbenv/spec/defines/rbenv__compile_spec.rb +34 -0
  296. data/modules/rbenv/spec/defines/rbenv__definition_spec.rb +40 -0
  297. data/modules/rbenv/spec/defines/rbenv__install_spec.rb +24 -0
  298. data/modules/rbenv/spec/defines/rbenv__plugin__rbenvvars_spec.rb +14 -0
  299. data/modules/rbenv/spec/defines/rbenv__plugin__rubybuild_spec.rb +14 -0
  300. data/modules/rbenv/spec/defines/rbenv__plugin_spec.rb +31 -0
  301. data/modules/rbenv/spec/fixtures/manifests/site.pp +0 -0
  302. data/modules/rbenv/spec/spec_helper.rb +6 -1
  303. data/modules/rbenv/templates/Gemfile.erb +5 -0
  304. data/modules/rbenv/templates/dot.rbenvrc.erb +8 -0
  305. metadata +271 -23
  306. data/modules/rbenv/CHANGELOG +0 -33
  307. data/modules/rbenv/LICENSE +0 -20
  308. data/modules/rbenv/manifests/alias.pp +0 -32
  309. data/modules/rbenv/manifests/global.pp +0 -22
  310. data/modules/rbenv/manifests/init.pp +0 -30
  311. data/modules/rbenv/manifests/params.pp +0 -16
  312. data/modules/rbenv/manifests/rehash.pp +0 -28
  313. data/modules/rbenv/manifests/version.pp +0 -63
  314. data/modules/rbenv/spec/classes/rbenv__global_spec.rb +0 -31
  315. data/modules/rbenv/spec/classes/rbenv_spec.rb +0 -30
  316. data/modules/rbenv/spec/defines/rbenv__alias_spec.rb +0 -22
  317. data/modules/rbenv/spec/defines/rbenv__rehash_spec.rb +0 -22
  318. data/modules/rbenv/spec/defines/rbenv__version_spec.rb +0 -60
  319. data/modules/rbenv/spec/spec_helper_system.rb +0 -16
  320. data/modules/rbenv/spec/system/basic_spec.rb +0 -13
  321. data/modules/rbenv/templates/etc/profile.d/rbenv.sh.erb +0 -2
  322. data/modules/rbenv/tests/init.pp +0 -12
@@ -1,9 +1,9 @@
1
1
  upstream app_server {
2
- server localhost:<%= upstream_web_port %> fail_timeout=0;
2
+ server localhost:<%= upstream_port %> fail_timeout=0;
3
3
  }
4
4
 
5
5
  server {
6
- listen 80 default deferred; # for Linux
6
+ listen <%= port %> default deferred; # for Linux
7
7
 
8
8
  client_max_body_size 4G;
9
9
  server_name <%= server_name %>;
@@ -42,8 +42,9 @@ server {
42
42
  }
43
43
  }
44
44
 
45
+ <% if ssl -%>
45
46
  server {
46
- listen 443;
47
+ listen <%= ssl_port %>;
47
48
  client_max_body_size 4G;
48
49
  server_name <%= server_name %>;
49
50
 
@@ -84,3 +85,4 @@ server {
84
85
  root <%= web_root %>;
85
86
  }
86
87
  }
88
+ <% end -%>
@@ -0,0 +1,172 @@
1
+ ## 2013-12-05 Release 0.10.0
2
+ ### Summary:
3
+
4
+ This release adds FreeBSD osfamily support and various other improvements to some mods.
5
+
6
+ ### Features:
7
+
8
+ - Add suPHP_UserGroup directive to directory context
9
+ - Add support for ScriptAliasMatch directives
10
+ - Set SSLOptions StdEnvVars in server context
11
+ - No implicit <Directory> entry for ScriptAlias path
12
+ - Add support for overriding ErrorDocument
13
+ - Add support for AliasMatch directives
14
+ - Disable default "allow from all" in vhost-directories
15
+ - Add WSGIPythonPath as an optional parameter to mod_wsgi.
16
+ - Add mod_rpaf support
17
+ - Add directives: IndexOptions, IndexOrderDefault
18
+ - Add ability to include additional external configurations in vhost
19
+ - need to use the provider variable not the provider key value from the directory hash for matches
20
+ - Support for FreeBSD and few other features
21
+ - Add new params to apache::mod::mime class
22
+ - Allow apache::mod to specify module id and path
23
+ - added $server_root parameter
24
+ - Add Allow and ExtendedStatus support to mod_status
25
+ - Expand vhost/_directories.pp directive support
26
+ - Add initial support for nss module (no directives in vhost template yet)
27
+ - added peruser and event mpms
28
+ - added $service_name parameter
29
+ - add parameter for TraceEnable
30
+ - Make LogLevel configurable for server and vhost
31
+ - Add documentation about $ip
32
+ - Add ability to pass ip (instead of wildcard) in default vhost files
33
+
34
+ ### Bugfixes:
35
+
36
+ - Don't listen on port or set NameVirtualHost for non-existent vhost
37
+ - only apply Directory defaults when provider is a directory
38
+ - Working mod_authnz_ldap support on Debian/Ubuntu
39
+
40
+ ## 2013-09-06 Release 0.9.0
41
+ ### Summary:
42
+ This release adds more parameters to the base apache class and apache defined
43
+ resource to make the module more flexible. It also adds or enhances SuPHP,
44
+ WSGI, and Passenger mod support, and support for the ITK mpm module.
45
+
46
+ ### Backwards-incompatible Changes:
47
+ - Remove many default mods that are not normally needed.
48
+ - Remove `rewrite_base` `apache::vhost` parameter; did not work anyway.
49
+ - Specify dependencies on stdlib >=2.4.0 (this was already the case, but
50
+ making explicit)
51
+ - Deprecate `a2mod` in favor of the `apache::mod::*` classes and `apache::mod`
52
+ defined resource.
53
+
54
+ ### Features:
55
+ - `apache` class
56
+ - Add `httpd_dir` parameter to change the location of the configuration
57
+ files.
58
+ - Add `logroot` parameter to change the logroot
59
+ - Add `ports_file` parameter to changes the `ports.conf` file location
60
+ - Add `keepalive` parameter to enable persistent connections
61
+ - Add `keepalive_timeout` parameter to change the timeout
62
+ - Update `default_mods` to be able to take an array of mods to enable.
63
+ - `apache::vhost`
64
+ - Add `wsgi_daemon_process`, `wsgi_daemon_process_options`,
65
+ `wsgi_process_group`, and `wsgi_script_aliases` parameters for per-vhost
66
+ WSGI configuration.
67
+ - Add `access_log_syslog` parameter to enable syslogging.
68
+ - Add `error_log_syslog` parameter to enable syslogging of errors.
69
+ - Add `directories` hash parameter. Please see README for documentation.
70
+ - Add `sslproxyengine` parameter to enable SSLProxyEngine
71
+ - Add `suphp_addhandler`, `suphp_engine`, and `suphp_configpath` for
72
+ configuring SuPHP.
73
+ - Add `custom_fragment` parameter to allow for arbitrary apache
74
+ configuration injection. (Feature pull requests are prefered over using
75
+ this, but it is available in a pinch.)
76
+ - Add `apache::mod::suphp` class for configuring SuPHP.
77
+ - Add `apache::mod::itk` class for configuring ITK mpm module.
78
+ - Update `apache::mod::wsgi` class for global WSGI configuration with
79
+ `wsgi_socket_prefix` and `wsgi_python_home` parameters.
80
+ - Add README.passenger.md to document the `apache::mod::passenger` usage.
81
+ Added `passenger_high_performance`, `passenger_pool_idle_time`,
82
+ `passenger_max_requests`, `passenger_stat_throttle_rate`, `rack_autodetect`,
83
+ and `rails_autodetect` parameters.
84
+ - Separate the httpd service resource into a new `apache::service` class for
85
+ dependency chaining of `Class['apache'] -> <resource> ~>
86
+ Class['apache::service']`
87
+ - Added `apache::mod::proxy_balancer` class for `apache::balancer`
88
+
89
+ ### Bugfixes:
90
+ - Change dependency to puppetlabs-concat
91
+ - Fix ruby 1.9 bug for `a2mod`
92
+ - Change servername to be `$::hostname` if there is no `$::fqdn`
93
+ - Make `/etc/ssl/certs` the default ssl certs directory for RedHat non-5.
94
+ - Make `php` the default php package for RedHat non-5.
95
+ - Made `aliases` able to take a single alias hash instead of requiring an
96
+ array.
97
+
98
+ ## 2013-07-26 Release 0.8.1
99
+ ### Bugfixes:
100
+ - Update `apache::mpm_module` detection for worker/prefork
101
+ - Update `apache::mod::cgi` and `apache::mod::cgid` detection for
102
+ worker/prefork
103
+
104
+ ## 2013-07-16 Release 0.8.0
105
+ ### Features:
106
+ - Add `servername` parameter to `apache` class
107
+ - Add `proxy_set` parameter to `apache::balancer` define
108
+
109
+ ### Bugfixes:
110
+ - Fix ordering for multiple `apache::balancer` clusters
111
+ - Fix symlinking for sites-available on Debian-based OSs
112
+ - Fix dependency ordering for recursive confdir management
113
+ - Fix `apache::mod::*` to notify the service on config change
114
+ - Documentation updates
115
+
116
+ ## 2013-07-09 Release 0.7.0
117
+ ### Changes:
118
+ - Essentially rewrite the module -- too many to list
119
+ - `apache::vhost` has many abilities -- see README.md for details
120
+ - `apache::mod::*` classes provide httpd mod-loading capabilities
121
+ - `apache` base class is much more configurable
122
+
123
+ ### Bugfixes:
124
+ - Many. And many more to come
125
+
126
+ ## 2013-03-2 Release 0.6.0
127
+ - update travis tests (add more supported versions)
128
+ - add access log_parameter
129
+ - make purging of vhost dir configurable
130
+
131
+ ## 2012-08-24 Release 0.4.0
132
+ ### Changes:
133
+ - `include apache` is now required when using `apache::mod::*`
134
+
135
+ ### Bugfixes:
136
+ - Fix syntax for validate_re
137
+ - Fix formatting in vhost template
138
+ - Fix spec tests such that they pass
139
+
140
+ 2012-05-08 Puppet Labs <info@puppetlabs.com> - 0.0.4
141
+ e62e362 Fix broken tests for ssl, vhost, vhost::*
142
+ 42c6363 Changes to match style guide and pass puppet-lint without error
143
+ 42bc8ba changed name => path for file resources in order to name namevar by it's name
144
+ 72e13de One end too much
145
+ 0739641 style guide fixes: 'true' <> true, $operatingsystem needs to be $::operatingsystem, etc.
146
+ 273f94d fix tests
147
+ a35ede5 (#13860) Make a2enmod/a2dismo commands optional
148
+ 98d774e (#13860) Autorequire Package['httpd']
149
+ 05fcec5 (#13073) Add missing puppet spec tests
150
+ 541afda (#6899) Remove virtual a2mod definition
151
+ 976cb69 (#13072) Move mod python and wsgi package names to params
152
+ 323915a (#13060) Add .gitignore to repo
153
+ fdf40af (#13060) Remove pkg directory from source tree
154
+ fd90015 Add LICENSE file and update the ModuleFile
155
+ d3d0d23 Re-enable local php class
156
+ d7516c7 Make management of firewalls configurable for vhosts
157
+ 60f83ba Explicitly lookup scope of apache_name in templates.
158
+ f4d287f (#12581) Add explicit ordering for vdir directory
159
+ 88a2ac6 (#11706) puppetlabs-apache depends on puppetlabs-firewall
160
+ a776a8b (#11071) Fix to work with latest firewall module
161
+ 2b79e8b (#11070) Add support for Scientific Linux
162
+ 405b3e9 Fix for a2mod
163
+ 57b9048 Commit apache::vhost::redirect Manifest
164
+ 8862d01 Commit apache::vhost::proxy Manifest
165
+ d5c1fd0 Commit apache::mod::wsgi Manifest
166
+ a825ac7 Commit apache::mod::python Manifest
167
+ b77062f Commit Templates
168
+ 9a51b4a Vhost File Declarations
169
+ 6cf7312 Defaults for Parameters
170
+ 6a5b11a Ensure installed
171
+ f672e46 a2mod fix
172
+ 8a56ee9 add pthon support to apache
@@ -0,0 +1,234 @@
1
+ Checklist (and a short version for the impatient)
2
+ =================================================
3
+
4
+ * Commits:
5
+
6
+ - Make commits of logical units.
7
+
8
+ - Check for unnecessary whitespace with "git diff --check" before
9
+ committing.
10
+
11
+ - Commit using Unix line endings (check the settings around "crlf" in
12
+ git-config(1)).
13
+
14
+ - Do not check in commented out code or unneeded files.
15
+
16
+ - The first line of the commit message should be a short
17
+ description (50 characters is the soft limit, excluding ticket
18
+ number(s)), and should skip the full stop.
19
+
20
+ - Associate the issue in the message. The first line should include
21
+ the issue number in the form "(#XXXX) Rest of message".
22
+
23
+ - The body should provide a meaningful commit message, which:
24
+
25
+ - uses the imperative, present tense: "change", not "changed" or
26
+ "changes".
27
+
28
+ - includes motivation for the change, and contrasts its
29
+ implementation with the previous behavior.
30
+
31
+ - Make sure that you have tests for the bug you are fixing, or
32
+ feature you are adding.
33
+
34
+ - Make sure the test suites passe after your commit:
35
+ `rake spec spec:system` More information on [testing](#Testing) below
36
+
37
+ - When introducing a new feature, make sure it is properly
38
+ documented in the README.md
39
+
40
+ * Submission:
41
+
42
+ * Pre-requisites:
43
+
44
+ - Sign the [Contributor License Agreement](https://cla.puppetlabs.com/)
45
+
46
+ - Make sure you have a [GitHub account](https://github.com/join)
47
+
48
+ - [Create a ticket](http://projects.puppetlabs.com/projects/modules/issues/new), or [watch the ticket](http://projects.puppetlabs.com/projects/modules/issues) you are patching for.
49
+
50
+ * Preferred method:
51
+
52
+ - Fork the repository on GitHub.
53
+
54
+ - Push your changes to a topic branch in your fork of the
55
+ repository. (the format ticket/1234-short_description_of_change is
56
+ usually preferred for this project).
57
+
58
+ - Submit a pull request to the repository in the puppetlabs
59
+ organization.
60
+
61
+ The long version
62
+ ================
63
+
64
+ 1. Make separate commits for logically separate changes.
65
+
66
+ Please break your commits down into logically consistent units
67
+ which include new or changed tests relevent to the rest of the
68
+ change. The goal of doing this is to make the diff easier to
69
+ read for whoever is reviewing your code. In general, the easier
70
+ your diff is to read, the more likely someone will be happy to
71
+ review it and get it into the code base.
72
+
73
+ If you are going to refactor a piece of code, please do so as a
74
+ separate commit from your feature or bug fix changes.
75
+
76
+ We also really appreciate changes that include tests to make
77
+ sure the bug is not re-introduced, and that the feature is not
78
+ accidentally broken.
79
+
80
+ Describe the technical detail of the change(s). If your
81
+ description starts to get too long, that is a good sign that you
82
+ probably need to split up your commit into more finely grained
83
+ pieces.
84
+
85
+ Commits which plainly describe the things which help
86
+ reviewers check the patch and future developers understand the
87
+ code are much more likely to be merged in with a minimum of
88
+ bike-shedding or requested changes. Ideally, the commit message
89
+ would include information, and be in a form suitable for
90
+ inclusion in the release notes for the version of Puppet that
91
+ includes them.
92
+
93
+ Please also check that you are not introducing any trailing
94
+ whitespaces or other "whitespace errors". You can do this by
95
+ running "git diff --check" on your changes before you commit.
96
+
97
+ 2. Sign the Contributor License Agreement
98
+
99
+ Before we can accept your changes, we do need a signed Puppet
100
+ Labs Contributor License Agreement (CLA).
101
+
102
+ You can access the CLA via the [Contributor License Agreement link](https://cla.puppetlabs.com/)
103
+
104
+ If you have any questions about the CLA, please feel free to
105
+ contact Puppet Labs via email at cla-submissions@puppetlabs.com.
106
+
107
+ 3. Sending your patches
108
+
109
+ To submit your changes via a GitHub pull request, we _highly_
110
+ recommend that you have them on a topic branch, instead of
111
+ directly on "master".
112
+ It makes things much easier to keep track of, especially if
113
+ you decide to work on another thing before your first change
114
+ is merged in.
115
+
116
+ GitHub has some pretty good
117
+ [general documentation](http://help.github.com/) on using
118
+ their site. They also have documentation on
119
+ [creating pull requests](http://help.github.com/send-pull-requests/).
120
+
121
+ In general, after pushing your topic branch up to your
122
+ repository on GitHub, you can switch to the branch in the
123
+ GitHub UI and click "Pull Request" towards the top of the page
124
+ in order to open a pull request.
125
+
126
+
127
+ 4. Update the related GitHub issue.
128
+
129
+ If there is a GitHub issue associated with the change you
130
+ submitted, then you should update the ticket to include the
131
+ location of your branch, along with any other commentary you
132
+ may wish to make.
133
+
134
+ Testing
135
+ =======
136
+
137
+ Getting Started
138
+ ---------------
139
+
140
+ Our puppet modules provide [`Gemfile`](./Gemfile)s which can tell a ruby
141
+ package manager such as [bundler](http://bundler.io/) what Ruby packages,
142
+ or Gems, are required to build, develop, and test this software.
143
+
144
+ Please make sure you have [bundler installed](http://bundler.io/#getting-started)
145
+ on your system, then use it to install all dependencies needed for this project,
146
+ by running
147
+
148
+ ```shell
149
+ % bundle install
150
+ Fetching gem metadata from https://rubygems.org/........
151
+ Fetching gem metadata from https://rubygems.org/..
152
+ Using rake (10.1.0)
153
+ Using builder (3.2.2)
154
+ -- 8><-- many more --><8 --
155
+ Using rspec-system-puppet (2.2.0)
156
+ Using serverspec (0.6.3)
157
+ Using rspec-system-serverspec (1.0.0)
158
+ Using bundler (1.3.5)
159
+ Your bundle is complete!
160
+ Use `bundle show [gemname]` to see where a bundled gem is installed.
161
+ ```
162
+
163
+ NOTE some systems may require you to run this command with sudo.
164
+
165
+ If you already have those gems installed, make sure they are up-to-date:
166
+
167
+ ```shell
168
+ % bundle update
169
+ ```
170
+
171
+ With all dependencies in place and up-to-date we can now run the tests:
172
+
173
+ ```shell
174
+ % rake spec
175
+ ```
176
+
177
+ This will execute all the [rspec tests](http://rspec-puppet.com/) tests
178
+ under [spec/defines](./spec/defines), [spec/classes](./spec/classes),
179
+ and so on. rspec tests may have the same kind of dependencies as the
180
+ module they are testing. While the module defines in its [Modulefile](./Modulefile),
181
+ rspec tests define them in [.fixtures.yml](./fixtures.yml).
182
+
183
+ Some puppet modules also come with [beaker](https://github.com/puppetlabs/beaker)
184
+ tests. These tests spin up a virtual machine under
185
+ [VirtualBox](https://www.virtualbox.org/)) with, controlling it with
186
+ [Vagrant](http://www.vagrantup.com/) to actually simulate scripted test
187
+ scenarios. In order to run these, you will need both of those tools
188
+ installed on your system.
189
+
190
+ You can run them by issuing the following command
191
+
192
+ ```shell
193
+ % rake spec_clean
194
+ % rspec spec/acceptance
195
+ ```
196
+
197
+ This will now download a pre-fabricated image configured in the [default node-set](./spec/acceptance/nodesets/default.yml),
198
+ install puppet, copy this module and install its dependencies per [spec/spec_helper_acceptance.rb](./spec/spec_helper_acceptance.rb)
199
+ and then run all the tests under [spec/acceptance](./spec/acceptance).
200
+
201
+ Writing Tests
202
+ -------------
203
+
204
+ XXX getting started writing tests.
205
+
206
+ If you have commit access to the repository
207
+ ===========================================
208
+
209
+ Even if you have commit access to the repository, you will still need to
210
+ go through the process above, and have someone else review and merge
211
+ in your changes. The rule is that all changes must be reviewed by a
212
+ developer on the project (that did not write the code) to ensure that
213
+ all changes go through a code review process.
214
+
215
+ Having someone other than the author of the topic branch recorded as
216
+ performing the merge is the record that they performed the code
217
+ review.
218
+
219
+
220
+ Additional Resources
221
+ ====================
222
+
223
+ * [Getting additional help](http://projects.puppetlabs.com/projects/puppet/wiki/Getting_Help)
224
+
225
+ * [Writing tests](http://projects.puppetlabs.com/projects/puppet/wiki/Development_Writing_Tests)
226
+
227
+ * [Patchwork](https://patchwork.puppetlabs.com)
228
+
229
+ * [Contributor License Agreement](https://projects.puppetlabs.com/contributor_licenses/sign)
230
+
231
+ * [General GitHub documentation](http://help.github.com/)
232
+
233
+ * [GitHub pull request documentation](http://help.github.com/send-pull-requests/)
234
+
@@ -0,0 +1,25 @@
1
+ source 'https://rubygems.org'
2
+
3
+ group :development, :test do
4
+ gem 'rake', :require => false
5
+ gem 'rspec-puppet', :require => false
6
+ gem 'puppetlabs_spec_helper', :require => false
7
+ gem 'serverspec', :require => false
8
+ gem 'puppet-lint', :require => false
9
+ gem 'beaker', :require => false
10
+ gem 'beaker-rspec', :require => false
11
+ end
12
+
13
+ if facterversion = ENV['FACTER_GEM_VERSION']
14
+ gem 'facter', facterversion, :require => false
15
+ else
16
+ gem 'facter', :require => false
17
+ end
18
+
19
+ if puppetversion = ENV['PUPPET_GEM_VERSION']
20
+ gem 'puppet', puppetversion, :require => false
21
+ else
22
+ gem 'puppet', :require => false
23
+ end
24
+
25
+ # vim:ft=ruby
@@ -0,0 +1,15 @@
1
+ Copyright (C) 2012 Puppet Labs Inc
2
+
3
+ Puppet Labs can be contacted at: info@puppetlabs.com
4
+
5
+ Licensed under the Apache License, Version 2.0 (the "License");
6
+ you may not use this file except in compliance with the License.
7
+ You may obtain a copy of the License at
8
+
9
+ http://www.apache.org/licenses/LICENSE-2.0
10
+
11
+ Unless required by applicable law or agreed to in writing, software
12
+ distributed under the License is distributed on an "AS IS" BASIS,
13
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14
+ See the License for the specific language governing permissions and
15
+ limitations under the License.
@@ -0,0 +1,12 @@
1
+ name 'puppetlabs-apache'
2
+ version '0.10.0'
3
+ source 'git://github.com/puppetlabs/puppetlabs-apache.git'
4
+ author 'puppetlabs'
5
+ license 'Apache 2.0'
6
+ summary 'Puppet module for Apache'
7
+ description 'Module for Apache configuration'
8
+ project_page 'https://github.com/puppetlabs/puppetlabs-apache'
9
+
10
+ ## Add dependencies, if any:
11
+ dependency 'puppetlabs/stdlib', '>= 2.4.0'
12
+ dependency 'puppetlabs/concat', '>= 1.0.0'