Skip to content

Various fixes for genesis:permissions #54

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ericclemmons merged 3 commits into from
Nov 20, 2013
Merged

Various fixes for genesis:permissions #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0ec0c24
Various fixes for `genesis:permissions`
Nov 7, 2013
2266dbd
Added FS_METHOD setting of "direct"
Nov 8, 2013
56929b9
Merge branch 'master' into 39-permissions-fixes
EvanK Nov 18, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions deployment/lib/server.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@
desc "Fix permissions"
task :permissions do
# Avoid uploading problems if Apache owns directories
run "find #{remote_web} -follow -type d -exec chown :www-data {} \\;"
sudo "find -L #{remote_web} -type d -exec chown :www-data {} \\;"

# Both deploy & Apache have 1st control of directories
run "find #{remote_web} -follow -type d -exec chmod 775 {} \\;"
sudo "find -L #{remote_web} -type d -exec chmod 775 {} \\; -exec chmod g+s {} \\;"

# Files should not be executable, but deploy + Apache still have control
run "find #{remote_web} -follow -type f -exec chmod 644 {} \\;"
sudo "find -L #{remote_web} -type f -exec chmod 664 {} \\;"
end

namespace :logs do
Expand Down
4 changes: 2 additions & 2 deletions generator/app/templates/web/wp-config.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
.replace(/(\/\*\*#@\+(?:.|[\r\n])+?\*\/[\r\n]+)(?:.|[\r\n])+?([\r\n]+\/\*\*#@-\*\/)/m, '$1__GENERATED_SALTS_PLACEHOLDER__$2')
.split('__GENERATED_SALTS_PLACEHOLDER__').join(props.salts)

// Limit to 5 post revisions
.replace("/* That's all,", "define('WP_POST_REVISIONS', 5);\n\n/*That's all,")
// Limit to 5 post revisions, and force direct filesystem IO
.replace("/* That's all,", "define('WP_POST_REVISIONS', 5);\n\ndefine('FS_METHOD', 'direct');\n\n/*That's all,")
%>
if (WP_ENV !== 'www') {
Genesis::rewriteUrls();
Expand Down
4 changes: 4 additions & 0 deletions provisioning/roles/common/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,10 @@
when: has_vagrant.stdout
sudo: yes

- name: Add www-data user to deploy
user: name=www-data append=yes groups=deploy
sudo: yes

- name: Calculate PHP memory_limit
command: echo "{{ 256 if ansible_memtotal_mb > 2048 else 128 }}"
register: calc_php_memory_limit
Expand Down