kosmos/chef
8
3
Fork 0
Code Issues 34 Pull Requests 3 Projects 2 Activity

Update cookbooks for Ubuntu 16.04 TLS

Browse Source
This commit is contained in:
Greg Karékinian
2017-03-31 19:20:00 +02:00
parent 6430d71006
commit 8923d0d7ef
219 changed files with 2770 additions and 11511 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
cookbooks/mysql/templates/default/apparmor/usr.sbin.mysqld-instance.erb
View File

@@ -2,12 +2,13 @@
/etc/<%= @mysql_name %>/conf.d/ r,
/etc/<%= @mysql_name %>/conf.d/* r,
/etc/<%= @mysql_name %>/my.cnf r,
<%= @log_dir %>/ r,
<%= @log_dir %>/* rw,
<%= @data_dir %>/ r,
<%= @data_dir %>/** rwk,
<%= @run_dir %>/** rw,
<%= @pid_file %> rw,
<%= @socket_file %> rw,
<%= @config.log_dir %>/ r,
<%= @config.log_dir %>/* rw,
<%= @config.data_dir %>/ r,
<%= @config.data_dir %>/** rwk,
<%= @config.run_dir %>/** rw,
<%= @config.pid_file %> rw,
<%= @config.socket_file %> rw,
/tmp/<%= @mysql_name %>/ r,
/tmp/<%= @mysql_name %>/my.sql r,
<%= @config.tmp_dir %>/* rw,

2
cookbooks/mysql/templates/default/apparmor/usr.sbin.mysqld.erb
View File

@@ -35,8 +35,10 @@
/var/log/mysql/* rw,
/var/run/mysqld/mysqld.pid rw,
/var/run/mysqld/mysqld.sock w,
/var/run/mysqld/mysqld.sock.lock rw,
/run/mysqld/mysqld.pid rw,
/run/mysqld/mysqld.sock w,
/run/mysqld/mysqld.sock.lock rw,
/sys/devices/system/cpu/ r,

36
cookbooks/mysql/templates/default/my.cnf.erb
View File

@@ -7,8 +7,8 @@ default-character-set = <%= @config.charset %>
<% if @config.port %>
port = <%= @config.port %>
<% end %>
<% if @socket_file %>
socket = <%= @socket_file %>
<% if @config.socket_file %>
socket = <%= @config.socket_file %>
<% end %>
[mysql]
@@ -20,11 +20,11 @@ default-character-set = <%= @config.charset %>
<% if @config.run_user %>
user = <%= @config.run_user %>
<% end %>
<% if @pid_file %>
pid-file = <%= @pid_file %>
<% if @config.pid_file %>
pid-file = <%= @config.pid_file %>
<% end %>
<% if @socket_file %>
socket = <%= @socket_file %>
<% if @config.socket_file %>
socket = <%= @config.socket_file %>
<% end %>
<% if @config.bind_address %>
bind-address = <%= @config.bind_address %>
@@ -32,26 +32,26 @@ bind-address = <%= @config.bind_address %>
<% if @config.port %>
port = <%= @config.port %>
<% end %>
<% if @data_dir %>
datadir = <%= @data_dir %>
<% if @config.data_dir %>
datadir = <%= @config.data_dir %>
<% end %>
<% if @tmp_dir %>
tmpdir = <%= @tmp_dir %>
<% if @config.tmp_dir %>
tmpdir = <%= @config.tmp_dir %>
<% end %>
<% @config.mysqld_options.each do |option,value| %>
<%= option %> = <%= value %>
<% end %>
<% if @lc_messages_dir %>
lc-messages-dir = <%= @lc_messages_dir %>
<% if @config.lc_messages_dir %>
lc-messages-dir = <%= @config.lc_messages_dir %>
<% end %>
<% if @error_log %>
log-error = <%= @error_log %>
<% if @config.error_log %>
log-error = <%= @config.error_log %>
<% end %>
<% if @include_dir %>
!includedir <%= @include_dir %>
<% if @config.include_dir %>
!includedir <%= @config.include_dir %>
<% end %>
[mysqld_safe]
<% if @socket_file %>
socket = <%= @socket_file %>
<% if @config.socket_file %>
socket = <%= @config.socket_file %>
<% end %>