Skip to content

Commit 24f9a46

Browse files
author
Alexander Birk
committed
Install default apache2 and php
1 parent 3483123 commit 24f9a46

File tree

9 files changed

+100
-6
lines changed

9 files changed

+100
-6
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,5 @@
44
/.project
55
/.zfproject.xml
66
/.gitignore
7+
.idea
8+
.vagrant

.idea/inspectionProfiles/Project_Default.xml

Lines changed: 15 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/inspectionProfiles/profiles_settings.xml

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Vagrantfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,9 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
7777
# avoid a warning at "vagrant provision"
7878
chef.custom_config_path = "./infrastructure/chef-dash/.Vagrantfile.chef"
7979

80+
# switch on debugging if needed
81+
chef.log_level = :debug
82+
8083
chef.json = {
8184
mysql: {
8285
server_root_password: 'rootpass',
@@ -86,7 +89,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
8689
}
8790

8891
chef.run_list = [
89-
"recipe[chef-dash::default]"
92+
"recipe[chef-dash::common]"
9093
]
9194
end
9295
end

infrastructure/chef-dash/Berksfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
source "https://supermarket.getchef.com"
22

33
metadata
4+
5+
cookbook 'apache2', '~> 2.0.0'
6+
cookbook 'php', '~> 1.5.0'

infrastructure/chef-dash/metadata.rb

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
name 'chef-dash'
2-
maintainer 'YOUR_NAME'
3-
maintainer_email 'YOUR_EMAIL'
4-
license 'All rights reserved'
2+
maintainer 'Alexander Birk/Christoph Lukas'
3+
maintainer_email '[email protected]'
4+
license 'Apache License, Version 2.0'
55
description 'Installs/Configures chef-dash'
66
long_description 'Installs/Configures chef-dash'
77
version '0.1.0'
88

9+
depends 'apache2'
10+
depends 'php'
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
#
2+
# Cookbook Name:: chef-dash
3+
# Recipe:: common
4+
#
5+
# Copyright 2014 pingworks - Alexander Birk und Christoph Lukas
6+
#
7+
# Licensed under the Apache License, Version 2.0 (the "License");
8+
# you may not use this file except in compliance with the License.
9+
# You may obtain a copy of the License at
10+
#
11+
# http://www.apache.org/licenses/LICENSE-2.0
12+
#
13+
# Unless required by applicable law or agreed to in writing, software
14+
# distributed under the License is distributed on an "AS IS" BASIS,
15+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16+
# See the License for the specific language governing permissions and
17+
# limitations under the License.
18+
#
19+
20+
%w(vim less git wget zip unzip).each do |p|
21+
package p do
22+
action :install
23+
end
24+
end
25+
26+
include_recipe 'apache2::default'
27+
include_recipe 'php::default'
28+
Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,18 @@
11
#
22
# Cookbook Name:: chef-dash
33
# Recipe:: default
4+
5+
# Copyright 2014 pingworks - Alexander Birk und Christoph Lukas
46
#
5-
# Copyright (C) 2014 YOUR_NAME
7+
# Licensed under the Apache License, Version 2.0 (the "License");
8+
# you may not use this file except in compliance with the License.
9+
# You may obtain a copy of the License at
610
#
7-
# All rights reserved - Do Not Redistribute
11+
# http://www.apache.org/licenses/LICENSE-2.0
12+
#
13+
# Unless required by applicable law or agreed to in writing, software
14+
# distributed under the License is distributed on an "AS IS" BASIS,
15+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16+
# See the License for the specific language governing permissions and
17+
# limitations under the License.
818
#
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
#
2+
# Cookbook Name:: chef-dash
3+
# Recipe:: develop
4+
#
5+
# Copyright 2014 pingworks - Alexander Birk und Christoph Lukas
6+
#
7+
# Licensed under the Apache License, Version 2.0 (the "License");
8+
# you may not use this file except in compliance with the License.
9+
# You may obtain a copy of the License at
10+
#
11+
# http://www.apache.org/licenses/LICENSE-2.0
12+
#
13+
# Unless required by applicable law or agreed to in writing, software
14+
# distributed under the License is distributed on an "AS IS" BASIS,
15+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16+
# See the License for the specific language governing permissions and
17+
# limitations under the License.
18+
#
19+
%w(default-jre ant ant-contrib ruby rubygems ruby-compass xvfb iceweasel phpunit phpunit-selenium).each do |p|
20+
package p do
21+
action :install
22+
end
23+
end
24+

0 commit comments

Comments
 (0)