Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
T
typo3_site
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Chef Cookbooks
typo3_site
Commits
570984c3
Commit
570984c3
authored
7 years ago
by
Stefan Galinski
Browse files
Options
Downloads
Patches
Plain Diff
[BUGFIX] Support PHP 7.0 installations on xenial
parent
fc7d04e1
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
recipes/default.rb
+14
-5
14 additions, 5 deletions
recipes/default.rb
with
14 additions
and
5 deletions
recipes/default.rb
+
14
−
5
View file @
570984c3
...
...
@@ -75,10 +75,19 @@ include_recipe 'apache2'
include_recipe
'apache2::mod_ssl'
if
node
[
'platform_version'
]
==
'16.04'
package
'libapache2-mod-php'
+
node
[
'ubuntu_base'
][
'php_version'
]
%w(php php-cli php-curl php-intl php-gd php-mcrypt php-mysql php-xml php-json php-mbstring php-soap php-zip php-imagick)
.
each
do
|
name
|
package
name
do
action
:install
if
node
[
'ubuntu_base'
][
'php_version'
]
==
'7.1'
package
'libapache2-mod-php'
+
node
[
'ubuntu_base'
][
'php_version'
]
%w(php php-cli php-curl php-intl php-gd php-mcrypt php-mysql php-xml php-json php-mbstring php-soap php-zip php-imagick)
.
each
do
|
name
|
package
name
do
action
:install
end
end
else
package
'libapache2-mod-php7.0'
%w(php7.0 php-cli7.0 php-curl7.0 php-intl7.0 php-gd7.0 php-mcrypt7.0 php-mysql7.0 php-xml7.0 php-json7.0 php-mbstring7.0 php-soap7.0 php-zip7.0 php-imagick7.0)
.
each
do
|
name
|
package
name
do
action
:install
end
end
end
...
...
@@ -318,7 +327,7 @@ bash 'Setup TYPO3' do
user
'vagrant'
group
data_bag
[
'groupId'
]
timeout
3000000
only_if
{
node
[
'typo3_site'
][
'download_typo3'
]
}
only_if
{
node
[
'typo3_site'
][
'download_typo3'
]}
code
<<-
EOF
if [ ! -d
#{
node
[
'typo3_site'
][
'webroot'
]
}
/typo3_src-
#{
node
[
'typo3_site'
][
'typo3_version'
]
}
]
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment