le1t0-deprec 2.1.6.010 → 2.1.6.011

Sign up to get free protection for your applications and to get access to all the features.
data/CHANGELOG CHANGED
@@ -1,5 +1,9 @@
1
1
  # deprec changelog
2
2
 
3
+ = 2.1.6.011 (Jun 12, 2010)
4
+
5
+ * made mysql config configurable through deprec
6
+
3
7
  = 2.1.6.010 (Jun 10, 2010)
4
8
 
5
9
  * Added fixed version for sqlite3-ruby gem in rails recipe, since 1.3.0 cannot compile on Ubuntu Hardy
@@ -10,6 +10,99 @@ Capistrano::Configuration.instance(:must_exist).load do
10
10
  namespace :deprec do
11
11
  namespace :mysql do
12
12
 
13
+ set :mysql_client_port, 3306
14
+ set :mysql_client_socket, '/var/run/mysqld/mysqld.sock'
15
+
16
+ set :mysql_mysql_no_auto_rehash, false # faster start of mysql but no tab completion
17
+
18
+ set :mysql_mysqld_safe_socket, '/var/run/mysqld/mysqld.sock'
19
+ set :mysql_mysqld_safe_nice, 0
20
+
21
+ set :mysql_mysqldump_max_allowed_packet, '16M'
22
+ set :mysql_mysqldump_quote_names, true
23
+ set :mysql_mysqldump_quick, true
24
+
25
+ set :mysql_isamchk_key_buffer, '16M'
26
+ set :mysql_isamchk_sort_buffer_size, nil
27
+ set :mysql_isamchk_read_buffer, nil
28
+ set :mysql_isamchk_write_buffer, nil
29
+
30
+ set :mysql_myisamchk_key_buffer, nil
31
+ set :mysql_myisamchk_sort_buffer_size, nil
32
+ set :mysql_myisamchk_read_buffer, nil
33
+ set :mysql_myisamchk_write_buffer, nil
34
+
35
+ set :mysql_mysqld_innodb_force_recovery, nil # needed when recovering from innodb and parts can be saved
36
+ set :mysql_mysqld_user, 'mysql'
37
+ set :mysql_mysqld_pid_file, '/var/run/mysqld/mysqld.pid'
38
+ set :mysql_mysqld_socket, '/var/run/mysqld/mysqld.sock'
39
+ set :mysql_mysqld_port, 3306
40
+ set :mysql_mysqld_basedir, '/usr'
41
+ set :mysql_mysqld_datadir, '/var/lib/mysql'
42
+ set :mysql_mysqld_tmpdir, '/tmp'
43
+ set :mysql_mysqld_language, '/usr/share/mysql/english'
44
+ set :mysql_mysqld_default_storage_engine, nil
45
+ set :mysql_mysqld_skip_external_locking, true
46
+ set :mysql_mysqld_skip_bdb, true
47
+ set :mysql_mysqld_skip_innodb, false
48
+ set :mysql_mysqld_bind_address, '127.0.0.1'
49
+
50
+ set :mysql_mysqld_default_character_set, nil
51
+ set :mysql_mysqld_character_set_server, nil
52
+ set :mysql_mysqld_collation_server, nil
53
+ set :mysql_mysqld_group_concat_max_len, nil
54
+ set :mysql_mysqld_innodb_file_per_table, false
55
+
56
+ # this should be smaller than RAM:
57
+ # innodb_buffer_pool_size + key_buffer_size + max_connections*(sort_buffer_size+read_buffer_size+binlog_cache_size) + max_connections*2MB
58
+ set :mysql_mysqld_thread_cache_size, 8
59
+ set :mysql_mysqld_thread_stack, '128K'
60
+ set :mysql_mysqld_max_allowed_packet, '16M'
61
+ set :mysql_mysqld_table_cache, 64
62
+ set :mysql_mysqld_innodb_log_buffer_size, nil
63
+ set :mysql_mysqld_innodb_additional_mem_pool_size, nil
64
+ set :mysql_mysqld_innodb_flush_method, nil
65
+ set :mysql_mysqld_thread_concurrency, 10
66
+ set :mysql_mysqld_max_connections, nil
67
+ set :mysql_mysqld_read_buffer_size, nil
68
+ set :mysql_mysqld_read_rnd_buffer_size, nil
69
+ set :mysql_mysqld_sort_buffer_size, nil
70
+ set :mysql_mysqld_innodb_buffer_pool_size, nil
71
+ set :mysql_mysqld_key_buffer, '16M'
72
+ set :mysql_mysqld_query_cache_limit, '1M'
73
+ set :mysql_mysqld_query_cache_size, '16M'
74
+ set :mysql_mysqld_query_cache_type, nil
75
+ set :mysql_mysqld_tmp_table_size, nil
76
+ set :mysql_mysqld_max_heap_table_size, nil
77
+ set :mysql_mysqld_innodb_log_file_size, nil
78
+
79
+ set :mysql_mysqld_ssl_ca, nil
80
+ set :mysql_mysqld_ssl_cert, nil
81
+ set :mysql_mysqld_ssl_key, nil
82
+
83
+ set :mysql_mysqld_server_id, nil
84
+ set :mysql_mysqld_auto_increment_increment, nil
85
+ set :mysql_mysqld_auto_increment_offset, nil
86
+ set :mysql_mysqld_master_host, nil
87
+ set :mysql_mysqld_master_user, nil
88
+ set :mysql_mysqld_master_password, nil
89
+ set :mysql_mysqld_report_host, nil
90
+ set :mysql_mysqld_replicate_wild_ignore_table, nil
91
+
92
+ set :mysql_mysqld_log, nil # i.e. /var/log/mysql/mysql.log
93
+ set :mysql_mysqld_binlog_do_db, nil # i.e. include_database_name
94
+ set :mysql_mysqld_binlog_ignore_db, nil # i.e. include_database_name
95
+ set :mysql_mysqld_log_bin, '/var/log/mysql/mysql-bin.log'
96
+ set :mysql_mysqld_relay_log, nil
97
+ set :mysql_mysqld_relay_log_info_file, nil
98
+ set :mysql_mysqld_relay_log_index, nil
99
+ set :mysql_mysqld_expire_logs_days, 10
100
+ set :mysql_mysqld_max_binlog_size, '1024M'
101
+ set :mysql_mysqld_log_slow_queries, nil
102
+ set :mysql_mysqld_long_query_time, nil
103
+ set :mysql_mysqld_log_slave_updates, false
104
+ set :mysql_mysqld_log_queries_not_using_indexes, false
105
+
13
106
  set :mysql_admin_user, 'root'
14
107
  set(:mysql_admin_pass) { Capistrano::CLI.password_prompt "Enter database password for '#{mysql_admin_user}':"}
15
108
 
@@ -1,140 +1,100 @@
1
- #
2
- # The MySQL database server configuration file.
3
- #
4
- # You can copy this to one of:
5
- # - "/etc/mysql/my.cnf" to set global options,
6
- # - "~/.my.cnf" to set user-specific options.
7
- #
8
- # One can use all long options that the program supports.
9
- # Run program with --help to get a list of available options and with
10
- # --print-defaults to see which it would actually understand and use.
11
- #
12
- # For explanations see
13
- # http://dev.mysql.com/doc/mysql/en/server-system-variables.html
14
-
15
- # This will be passed to all mysql clients
16
- # It has been reported that passwords should be enclosed with ticks/quotes
17
- # escpecially if they contain "#" chars...
18
- # Remember to edit /etc/mysql/debian.cnf when changing the socket location.
19
1
  [client]
20
- port = 3306
21
- socket = /var/run/mysqld/mysqld.sock
2
+ <% if mysql_client_port %>port = <%= mysql_client_port %><% end %>
3
+ <% if mysql_client_socket %>socket = <%= mysql_client_socket %><% end %>
22
4
 
23
- # Here is entries for some specific programs
24
- # The following values assume you have at least 32M ram
5
+ [mysql]
6
+ <% if mysql_mysql_no_auto_rehash %>no-auto-rehash<% end %>
25
7
 
26
- # This was formally known as [safe_mysqld]. Both versions are currently parsed.
27
8
  [mysqld_safe]
28
- socket = /var/run/mysqld/mysqld.sock
29
- nice = 0
9
+ <% if mysql_mysqld_safe_socket %>socket = <%= mysql_mysqld_safe_socket %><% end %>
10
+ <% if mysql_mysqld_safe_nice %>nice = <%= mysql_mysqld_safe_nice %><% end %>
30
11
 
31
- [mysqld]
32
- #
33
- # * Basic Settings
34
- #
35
- user = mysql
36
- pid-file = /var/run/mysqld/mysqld.pid
37
- socket = /var/run/mysqld/mysqld.sock
38
- port = 3306
39
- basedir = /usr
40
- datadir = /var/lib/mysql
41
- tmpdir = /tmp
42
- language = /usr/share/mysql/english
43
- skip-external-locking
44
- #
45
- # Instead of skip-networking the default is now to listen only on
46
- # localhost which is more compatible and is not less secure.
47
- bind-address = 127.0.0.1
48
- #
49
- # * Fine Tuning
50
- #
51
- key_buffer = 16M
52
- max_allowed_packet = 16M
53
- thread_stack = 128K
54
- thread_cache_size = 8
55
- #max_connections = 100
56
- #table_cache = 64
57
- #thread_concurrency = 10
58
- #
59
- # * Query Cache Configuration
60
- #
61
- query_cache_limit = 1M
62
- query_cache_size = 16M
63
- #
64
- # * Logging and Replication
65
- #
66
- # Both location gets rotated by the cronjob.
67
- # Be aware that this log type is a performance killer.
68
- #log = /var/log/mysql/mysql.log
69
- #
70
- # Error logging goes to syslog. This is a Debian improvement :)
71
- #
72
- # Here you can see queries with especially long duration
73
- #log_slow_queries = /var/log/mysql/mysql-slow.log
74
- #long_query_time = 2
75
- #log-queries-not-using-indexes
76
- #
77
- # The following can be used as easy to replay backup logs or for replication.
78
- # note: if you are setting up a replication slave, see README.Debian about
79
- # other settings you may need to change.
80
- #server-id = 1
81
- log_bin = /var/log/mysql/mysql-bin.log
82
- # WARNING: Using expire_logs_days without bin_log crashes the server! See README.Debian!
83
- expire_logs_days = 10
84
- max_binlog_size = 100M
85
- #binlog_do_db = include_database_name
86
- #binlog_ignore_db = include_database_name
87
- #
88
- # * BerkeleyDB
89
- #
90
- # Using BerkeleyDB is now discouraged as its support will cease in 5.1.12.
91
- skip-bdb
92
- #
93
- # * InnoDB
94
- #
95
- # InnoDB is enabled by default with a 10MB datafile in /var/lib/mysql/.
96
- # Read the manual for more InnoDB related options. There are many!
97
- # You might want to disable InnoDB to shrink the mysqld process by circa 100MB.
98
- #skip-innodb
99
- #
100
- # * Security Features
101
- #
102
- # Read the manual, too, if you want chroot!
103
- # chroot = /var/lib/mysql/
104
- #
105
- # For generating SSL certificates I recommend the OpenSSL GUI "tinyca".
106
- #
107
- # ssl-ca=/etc/mysql/cacert.pem
108
- # ssl-cert=/etc/mysql/server-cert.pem
109
- # ssl-key=/etc/mysql/server-key.pem
12
+ [mysqldump]
13
+ <% if mysql_mysqldump_max_allowed_packet %>max_allowed_packet = <%= mysql_mysqldump_max_allowed_packet %><% end %>
14
+ <% if mysql_mysqldump_quote_names %>quote-names<% end %>
15
+ <% if mysql_mysqldump_quick %>quick<% end %>
110
16
 
17
+ [isamchk]
18
+ <% if mysql_isamchk_key_buffer %>key_buffer = <%= mysql_isamchk_key_buffer %><% end %>
19
+ <% if mysql_isamchk_sort_buffer_size %>sort_buffer_size = <%= mysql_isamchk_sort_buffer_size %><% end %>
20
+ <% if mysql_isamchk_read_buffer %>read_buffer = <%= mysql_isamchk_read_buffer %><% end %>
21
+ <% if mysql_isamchk_write_buffer %>write_buffer = <%= mysql_isamchk_write_buffer %><% end %>
111
22
 
23
+ [myisamchk]
24
+ <% if mysql_myisamchk_key_buffer %>key_buffer = <%= mysql_myisamchk_key_buffer %><% end %>
25
+ <% if mysql_myisamchk_sort_buffer_size %>sort_buffer_size = <%= mysql_myisamchk_sort_buffer_size %><% end %>
26
+ <% if mysql_myisamchk_read_buffer %>read_buffer = <%= mysql_myisamchk_read_buffer %><% end %>
27
+ <% if mysql_myisamchk_write_buffer %>write_buffer = <%= mysql_myisamchk_write_buffer %><% end %>
112
28
 
113
- [mysqldump]
114
- quick
115
- quote-names
116
- max_allowed_packet = 16M
29
+ [mysqld]
30
+ <% if mysql_mysqld_innodb_force_recovery %>innodb_force_recovery = <%= mysql_mysqld_innodb_force_recovery %><% end %>
31
+ <% if mysql_mysqld_user %>user = <%= mysql_mysqld_user %><% end %>
32
+ <% if mysql_mysqld_pid_file %>pid-file = <%= mysql_mysqld_pid_file %><% end %>
33
+ <% if mysql_mysqld_socket %>socket = <%= mysql_mysqld_socket %><% end %>
34
+ <% if mysql_mysqld_port %>port = <%= mysql_mysqld_port %><% end %>
35
+ <% if mysql_mysqld_basedir %>basedir = <%= mysql_mysqld_basedir %><% end %>
36
+ <% if mysql_mysqld_datadir %>datadir = <%= mysql_mysqld_datadir %><% end %>
37
+ <% if mysql_mysqld_tmpdir %>tmpdir = <%= mysql_mysqld_tmpdir %><% end %>
38
+ <% if mysql_mysqld_language %>language = <%= mysql_mysqld_language %><% end %>
39
+ <% if mysql_mysqld_default_storage_engine %>default-storage-engine = <%= mysql_mysqld_default_storage_engine %><% end %>
40
+ <% if mysql_mysqld_skip_external_locking %>skip-external-locking<% end %>
41
+ <% if mysql_mysqld_skip_bdb %>skip-bdb<% end %>
42
+ <% if mysql_mysqld_skip_innodb %>skip-innodb<% end %>
43
+ <% if mysql_mysqld_bind_address %>bind-address = <%= mysql_mysqld_bind_address %><% end %>
117
44
 
118
- [mysql]
119
- #no-auto-rehash # faster start of mysql but no tab completition
45
+ <% if mysql_mysqld_default_character_set %>default-character-set = <%= mysql_mysqld_default_character_set %><% end %>
46
+ <% if mysql_mysqld_character_set_server %>character-set-server = <%= mysql_mysqld_character_set_server %><% end %>
47
+ <% if mysql_mysqld_collation_server %>collation-server = <%= mysql_mysqld_collation_server %><% end %>
48
+ <% if mysql_mysqld_group_concat_max_len %>group_concat_max_len = <%= mysql_mysqld_group_concat_max_len %><% end %>
49
+ <% if mysql_mysqld_innodb_file_per_table %>innodb_file_per_table<% end %>
120
50
 
121
- [isamchk]
122
- key_buffer = 16M
51
+ <% if mysql_mysqld_thread_cache_size %>thread_cache_size = <%= mysql_mysqld_thread_cache_size %><% end %>
52
+ <% if mysql_mysqld_thread_stack %>thread_stack = <%= mysql_mysqld_thread_stack %><% end %>
53
+ <% if mysql_mysqld_max_allowed_packet %>max_allowed_packet = <%= mysql_mysqld_max_allowed_packet %><% end %>
54
+ <% if mysql_mysqld_table_cache %>table_cache = <%= mysql_mysqld_table_cache %><% end %>
55
+ <% if mysql_mysqld_innodb_log_buffer_size %>innodb_log_buffer_size = <%= mysql_mysqld_innodb_log_buffer_size %><% end %>
56
+ <% if mysql_mysqld_innodb_additional_mem_pool_size %>innodb_additional_mem_pool_size = <%= mysql_mysqld_innodb_additional_mem_pool_size %><% end %>
57
+ <% if mysql_mysqld_innodb_flush_method %>innodb_flush_method = <%= mysql_mysqld_innodb_flush_method %><% end %>
58
+ <% if mysql_mysqld_thread_concurrency %>thread_concurrency = <%= mysql_mysqld_thread_concurrency %><% end %>
59
+ <% if mysql_mysqld_innodb_thread_concurrency %>thread_innodb_concurrency = <%= mysql_mysqld_innodb_thread_concurrency %><% end %>
60
+ <% if mysql_mysqld_max_connections %>max_connections = <%= mysql_mysqld_max_connections %><% end %>
61
+ <% if mysql_mysqld_read_buffer_size %>read_buffer_size = <%= mysql_mysqld_read_buffer_size %><% end %>
62
+ <% if mysql_mysqld_read_rnd_buffer_size %>read_rnd_buffer_size = <%= mysql_mysqld_read_rnd_buffer_size %><% end %>
63
+ <% if mysql_mysqld_sort_buffer_size %>sort_buffer_size = <%= mysql_mysqld_sort_buffer_size %><% end %>
64
+ <% if mysql_mysqld_innodb_buffer_pool_size %>innodb_buffer_pool_size = <%= mysql_mysqld_innodb_buffer_pool_size %><% end %>
65
+ <% if mysql_mysqld_key_buffer %>key_buffer = <%= mysql_mysqld_key_buffer %><% end %>
66
+ <% if mysql_mysqld_query_cache_limit %>query_cache_limit = <%= mysql_mysqld_query_cache_limit %><% end %>
67
+ <% if mysql_mysqld_query_cache_size %>query_cache_size = <%= mysql_mysqld_query_cache_size %><% end %>
68
+ <% if mysql_mysqld_query_cache_type %>query_cache_type = <%= mysql_mysqld_query_cache_type %><% end %>
69
+ <% if mysql_mysqld_tmp_table_size %>tmp_table_size = <%= mysql_mysqld_tmp_table_size %><% end %>
70
+ <% if mysql_mysqld_max_heap_table_size %>max_heap_table_size = <%= mysql_mysqld_max_heap_table_size %><% end %>
71
+ <% if mysql_mysqld_innodb_log_file_size %>innodb_log_file_size = <%= mysql_mysqld_innodb_log_file_size %><% end %>
123
72
 
124
- #
125
- # * NDB Cluster
126
- #
127
- # See /usr/share/doc/mysql-server-*/README.Debian for more information.
128
- #
129
- # The following configuration is read by the NDB Data Nodes (ndbd processes)
130
- # not from the NDB Management Nodes (ndb_mgmd processes).
131
- #
132
- # [MYSQL_CLUSTER]
133
- # ndb-connectstring=127.0.0.1
73
+ <% if mysql_mysqld_log %>log = <%= mysql_mysqld_log %><% end %>
74
+ <% if mysql_mysqld_binlog_do_db %>binlog_do_db = <%= mysql_mysqld_binlog_do_db %><% end %>
75
+ <% if mysql_mysqld_binlog_ignore_db %>binlog_ignore_db = <%= mysql_mysqld_binlog_ignore_db %><% end %>
76
+ <% if mysql_mysqld_log_bin %>log_bin = <%= mysql_mysqld_log_bin %><% end %>
77
+ <% if mysql_mysqld_relay_log %>relay_log = <%= mysql_mysqld_relay_log %><% end %>
78
+ <% if mysql_mysqld_relay_log_info_file %>relay_log_info_file = <%= mysql_mysqld_relay_log_info_file %><% end %>
79
+ <% if mysql_mysqld_relay_log_index %>relay_log_index = <%= mysql_mysqld_relay_log_index %><% end %>
80
+ <% if mysql_mysqld_expire_logs_days %>expire_logs_days = <%= mysql_mysqld_expire_logs_days %><% end %>
81
+ <% if mysql_mysqld_max_binlog_size %>max_binlog_size = <%= mysql_mysqld_max_binlog_size %><% end %>
82
+ <% if mysql_mysqld_log_slow_queries %>log_slow_queries = <%= mysql_mysqld_log_slow_queries %><% end %>
83
+ <% if mysql_mysqld_long_query_time %>long_query_time = <%= mysql_mysqld_long_query_time %><% end %>
84
+ <% if mysql_mysqld_log_slave_updates %>log_slave_updates<% end %>
85
+ <% if mysql_mysqld_log_queries_not_using_indexes %>log-queries-not-using-indexes<% end %>
134
86
 
87
+ <% if mysql_mysqld_server_id %>server_id = <%= mysql_mysqld_server_id %><% end %>
88
+ <% if mysql_mysqld_auto_increment_increment %>auto_increment_increment = <%= mysql_mysqld_auto_increment_increment %><% end %>
89
+ <% if mysql_mysqld_auto_increment_offset %>auto_increment_offset = <%= mysql_mysqld_auto_increment_offset %><% end %>
90
+ <% if mysql_mysqld_master_host %>master_host = <%= mysql_mysqld_master_host %><% end %>
91
+ <% if mysql_mysqld_master_user %>master_user = <%= mysql_mysqld_master_user %><% end %>
92
+ <% if mysql_mysqld_master_password %>master_password = <%= mysql_mysqld_master_password %><% end %>
93
+ <% if mysql_mysqld_report_host %>report_host = <%= mysql_mysqld_report_host %><% end %>
94
+ <% if mysql_mysqld_replicate_wild_ignore_table %>replicate_wild_ignore_table = <%= mysql_mysqld_replicate_wild_ignore_table %><% end %>
135
95
 
136
- #
137
- # * IMPORTANT: Additional settings that can override those from this file!
138
- #
139
- !includedir /etc/mysql/conf.d/
96
+ <% if mysql_mysqld_ssl_ca %> = <%= mysql_mysqld_ssl_ca %><% end %>
97
+ <% if mysql_mysqld_ssl_cert %> = <%= mysql_mysqld_ssl_cert %><% end %>
98
+ <% if mysql_mysqld_ssl_key %> = <%= mysql_mysqld_ssl_key %><% end %>
140
99
 
100
+ !includedir /etc/mysql/conf.d/
metadata CHANGED
@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
6
6
  - 2
7
7
  - 1
8
8
  - 6
9
- - 10
10
- version: 2.1.6.010
9
+ - 11
10
+ version: 2.1.6.011
11
11
  platform: ruby
12
12
  authors:
13
13
  - Le1t0
@@ -15,7 +15,7 @@ autorequire:
15
15
  bindir: bin
16
16
  cert_chain: []
17
17
 
18
- date: 2010-06-10 00:00:00 +02:00
18
+ date: 2010-06-12 00:00:00 +02:00
19
19
  default_executable: depify
20
20
  dependencies:
21
21
  - !ruby/object:Gem::Dependency