diff options
| author | Sebastian Kemper <sebastian_ml@gmx.net> | 2020-05-11 22:14:54 +0200 |
|---|---|---|
| committer | Sebastian Kemper <sebastian_ml@gmx.net> | 2020-05-11 22:15:01 +0200 |
| commit | 19de52a044e336b3f2acb06d9c20ea3044f538ee (patch) | |
| tree | ae2abb3548898dab04825bf362d8a5e202b0fcb0 | |
| parent | 59b91fc342aa69c8aa107587fd29ff2161159c65 (diff) | |
mariadb: install config files readable for all
Until now $(INSTALL_CONF) is used for configuration files that go into
/etc/mysql. This commit replaces that with $(INSTALL_DATA). The
configuration files are not only parsed by the server, but also by the
clients (which can be anybody).
This also removes a comment about a cron job from one of the
configuration files. There is no cron job.
Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
| -rw-r--r-- | libs/libmariadb/Makefile | 4 | ||||
| -rw-r--r-- | utils/mariadb-common/Makefile | 4 | ||||
| -rw-r--r-- | utils/mariadb/Makefile | 6 | ||||
| -rw-r--r-- | utils/mariadb/conf/50-server.cnf | 1 |
4 files changed, 7 insertions, 8 deletions
diff --git a/libs/libmariadb/Makefile b/libs/libmariadb/Makefile index db9d259e7..64c849edf 100644 --- a/libs/libmariadb/Makefile +++ b/libs/libmariadb/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libmariadb PKG_VERSION:=3.1.7 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=mariadb-connector-c-$(PKG_VERSION)-src.tar.gz PKG_SOURCE_URL := \ @@ -160,7 +160,7 @@ define Package/$(PKG_NAME)/install $(PKG_INSTALL_DIR)$(MARIADB_PLUGIN_DIR)/sha256_password.so \ $(1)$(MARIADB_PLUGIN_DIR) $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/libmariadb.so.$(ABI_VERSION) $(1)/usr/lib - $(INSTALL_CONF) conf/50-client.cnf $(1)$(MARIADB_CONF_DIR)/conf.d + $(INSTALL_DATA) conf/50-client.cnf $(1)$(MARIADB_CONF_DIR)/conf.d endef define BuildPlugin diff --git a/utils/mariadb-common/Makefile b/utils/mariadb-common/Makefile index ce87718d6..ff0962cc4 100644 --- a/utils/mariadb-common/Makefile +++ b/utils/mariadb-common/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mariadb-common PKG_VERSION:=1.0 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_MAINTAINER:=Sebastian Kemper <sebastian_ml@gmx.net> PKG_LICENSE:=GPL-2.0 @@ -40,7 +40,7 @@ endef define Package/mariadb-common/install $(INSTALL_DIR) $(1)$(CONF_DIR) - $(INSTALL_CONF) conf/my.cnf $(1)$(CONF_DIR) + $(INSTALL_DATA) conf/my.cnf $(1)$(CONF_DIR) endef define Build/Compile diff --git a/utils/mariadb/Makefile b/utils/mariadb/Makefile index 8df97e865..5d5e1629e 100644 --- a/utils/mariadb/Makefile +++ b/utils/mariadb/Makefile @@ -486,7 +486,7 @@ endef define Package/mariadb-client-base/install $(INSTALL_DIR) $(1)$(CONF_DIR)/conf.d - $(INSTALL_CONF) conf/50-mysql-clients.cnf $(1)$(CONF_DIR)/conf.d + $(INSTALL_DATA) conf/50-mysql-clients.cnf $(1)$(CONF_DIR)/conf.d endef define Package/mariadb-client-extra/install @@ -507,8 +507,8 @@ define Package/mariadb-server-base/install $(INSTALL_DIR) $(1)/etc/init.d $(INSTALL_BIN) files/mysqld.init $(1)/etc/init.d/mysqld $(SED) '/^[a-z]/s/^/#/' $(PKG_INSTALL_DIR)$(SHARE_DIR)/wsrep.cnf - $(INSTALL_CONF) $(PKG_INSTALL_DIR)$(SHARE_DIR)/wsrep.cnf $(1)$(CONF_DIR)/conf.d/60-galera.cnf - $(INSTALL_CONF) conf/50-server.cnf $(1)$(CONF_DIR)/conf.d + $(INSTALL_DATA) $(PKG_INSTALL_DIR)$(SHARE_DIR)/wsrep.cnf $(1)$(CONF_DIR)/conf.d/60-galera.cnf + $(INSTALL_DATA) conf/50-server.cnf $(1)$(CONF_DIR)/conf.d $(INSTALL_CONF) files/mysqld.config $(1)/etc/config/mysqld $(INSTALL_DATA) $(PKG_INSTALL_DIR)$(SHARE_DIR)/charsets/* $(1)$(SHARE_DIR)/charsets $(INSTALL_DATA) $(PKG_INSTALL_DIR)$(SHARE_DIR)/english/errmsg.sys $(1)$(SHARE_DIR)/english diff --git a/utils/mariadb/conf/50-server.cnf b/utils/mariadb/conf/50-server.cnf index d478d1f5e..7e0c6d539 100644 --- a/utils/mariadb/conf/50-server.cnf +++ b/utils/mariadb/conf/50-server.cnf @@ -56,7 +56,6 @@ query_cache_size = 16M # # * Logging and Replication # -# Both location gets rotated by the cronjob. # Be aware that this log type is a performance killer. # As of 5.1 you can enable the log at runtime! #general_log_file = /var/log/mysql/mysql.log |