WMDE
/
wmdeit-cf-wmdelib
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: WMDE:b962c1452a0619d13048c3c753ef22f736bf2c7a
Branches Tags
WMDE:main
..
compare: WMDE:47c8c7878fa48f5eee313a37a91d1361d11da37c
Branches Tags
WMDE:main

No commits in common. "b962c1452a0619d13048c3c753ef22f736bf2c7a" and "47c8c7878fa48f5eee313a37a91d1361d11da37c" have entirely different histories.
b962c1452a ... 47c8c7878f

5 changed files with 6 additions and 40 deletions
Show Stats Expand all files Collapse all files

5
apache.cf
View File

@ -77,7 +77,6 @@ vars:
{m: "unixd",f:"mod_unixd"},
{m: "ssl",f:"mod_ssl"},
{m:"proxy",f:"mod_proxy"},
{m:"proxy_fcgi",f:"mod_proxy_fcgi"},
{m:"proxy_http",f:"mod_proxy_http"},
{m:"proxy_http2",f:"mod_proxy_http2"},
{m:"remoteip",f:"mod_remoteip"}
@ -153,8 +152,7 @@ vars:
{m: "log_config",f:"mod_log_config"},
{m: "version",f:"mod_version"},
{m: "unixd",f:"mod_unixd"},
{m: "systemd",f:"mod_systemd"},
{m: "systemd",f:"mod_systemd"}
]';
# {m: "php",f:"libphp8"},
centos::
@ -169,7 +167,6 @@ vars:
{m: "unixd",f:"mod_unixd"},
{m: "systemd",f:"mod_systemd"},
{m:"ssl",f:"mod_ssl"},
{m: "remoteip",f:"mod_remoteip"}
]';

24
lib.cf
View File

@ -369,27 +369,3 @@ reports:
}
bundle edit_line bind_mount(src,dst)
{
insert_lines:
freebsd::
"$(src) $(dst) nullfs rw,late 0 0";
centos::
"$(src) $(dst) none defaults,bind 0 0";
}
bundle agent bind_mount(src,dst)
{
files:
"/etc/fstab"
edit_line => bind_mount("$(src)","$(dst)"),
classes => if_repaired(bind_mount_fstab_changed);
commands:
bind_mount_fstab_changed::
"echo '$(src)$(dst)' > /dev/null && mount"
contain=>wmde_cmd_useshell,
args => "-a";
}

2
mailserver.cf
View File

@ -79,7 +79,7 @@ vars:
"default-authentication-plugin":"mysql_native_password"
}
},
"mariadb":false,
"bind_address":"$(cfg[db_host])",
"backup_dir":"/tank/backups/mysql_backups"
}';

12
mysql.cf
View File

@ -10,20 +10,17 @@ vars:
"bind_address":"127.0.0.1",
"user":"mysql",
"port":"3306",
"backup_dir":"/var/backups",
"mariadb":true
"backup_dir":"/var/backups"
}';
"cfg" data => mergedata(@(default_cfg),@(cfg_param));
freebsd::
"user" string => "mysql";
# "server_pkgs" slist => {"mariadb106-server"};
# "client_pkgs" slist => {"mariadb106-client"};
"server_pkgs" slist => {"mysql80-server"};
"client_pkgs" slist => {"mysql80-client"};
"server_pkgs" slist => {"mariadb106-server"}, if => strcmp("$(cfg[mariadb])","true");
"client_pkgs" slist => {"mariadb106-client"}, if => strcmp("$(cfg[mariadb])","true");
"type" string => "mysql8";
"service_name" string => "mysql-server";
"cfg_dir" string => "/usr/local/etc/mysql";
@ -376,7 +373,6 @@ $(cron) root $(table_exists_cmd) && $(backup_cmd)
bundle agent create_mysql_db(cfg)
{
classes:
"type_$(mysql.type)" ;
# "do_restore" expression => isvariable("cfg[restore]");
"do_restore" expression => strcmp("$(cfg[db_restore])","true");
@ -388,8 +384,6 @@ vars:
"db_pass" string => "$(cfg[db_pass])";
"args" string => "pnunf";
type_mariadb::
"args" string => "-e \"CREATE DATABASE IF NOT EXISTS $(db_name); GRANT ALL PRIVILEGES ON $(db_name).* TO '$(db_user)'@'$(host)' IDENTIFIED BY '$(db_pass)'; \" ";

3
php.cf
View File

@ -96,7 +96,6 @@ vars:
"php-pecl-json-post",
"php-pecl-apcu",
"php-pecl-zip",
"php$(xversion)-process"
};
@ -227,7 +226,7 @@ vars:
centos::
"cli_exe" string => "/usr/bin/php";
"version" string => "8.1";
"version" string => "8.0";
"fpm_pkgs" slist => { "php-fpm" };
"fpm_service_name" string => "php$(version)-fpm";
"fpm_socket" string => "/run/php-fpm/www.sock";