From da7be10d58eb1487725575a484a9c6952a4e4bee Mon Sep 17 00:00:00 2001 From: Micke Nordin Date: Wed, 26 Mar 2025 14:09:24 +0100 Subject: [PATCH] Fix typos --- manifests/db_type.pp | 2 +- templates/mariadb/05-roundcube.sql.erb | 9 ++------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/manifests/db_type.pp b/manifests/db_type.pp index d5dabc8..0826a56 100644 --- a/manifests/db_type.pp +++ b/manifests/db_type.pp @@ -15,7 +15,7 @@ define sunetdrive::db_type( $backup_password = safe_hiera('backup_password') $proxysql_password = safe_hiera('proxysql_password') $mysql_user_password = safe_hiera('mysql_user_password') - $roundcube_password = safe_hiera('rundcube_password') + $roundcube_password = safe_hiera('roundcube_password') $mariadb_dir = '/etc/mariadb' $mycnf_path = 'sunetdrive/mariadb/my.cnf.erb' $server_id = 1000 + Integer($facts['networking']['hostname'][-1]) diff --git a/templates/mariadb/05-roundcube.sql.erb b/templates/mariadb/05-roundcube.sql.erb index 4d1c037..0a48311 100644 --- a/templates/mariadb/05-roundcube.sql.erb +++ b/templates/mariadb/05-roundcube.sql.erb @@ -1,8 +1,3 @@ -CREATE SCHEMA roundcube; +CREATE SCHEMA roundcubemail; CREATE USER 'roundcube'@'%' IDENTIFIED BY '<%= @roundcube_password %>'; -GRANT ALL PRIVILEGES ON roundcube.* TO 'roundcube'@'%' IDENTIFIED BY '<%= @roundcube_password %>'; --- USE roundcube; --- CREATE TABLE `cache` ( `user_id` int(10) unsigned NOT NULL, `cache_key` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL, `expires` datetime DEFAULT NULL, `data` longtext NOT NULL, PRIMARY KEY --- (`user_id`,`cache_key`), KEY `expires_index` (`expires`), CONSTRAINT `user_id_fk_cache` FOREIGN KEY (`user_id`) REFERENCES `users` (`user_id`) ON DELETE CASCADE ON UPDATE CASCADE) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC --- CREATE TABLE `users` ( `user_id` int(10) unsigned NOT NULL AUTO_INCREMENT, `username` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL, `mail_host` varchar(128) NOT NULL, `created` datetime NOT --- NULL DEFAULT '1000-01-01 00:00:00', `last_login` datetime DEFAULT NULL, `failed_login` datetime DEFAULT NULL, `failed_login_counter` int(10) unsigned DEFAULT NULL, `language` varchar(16) DEFAULT NULL, `preferences` longtext DEFAULT NULL, PRIMARY KEY (`user_id`), UNIQUE KEY `username` (`username`,`mail_host`)) ENGINE=InnoDB AUTO_INCREMENT=13 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC; +GRANT ALL PRIVILEGES ON roundcubemail.* TO 'roundcube'@'%' IDENTIFIED BY '<%= @roundcube_password %>';