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

Compare commits

base: WMDE:dcf16d21b489614a90c507df667a4d3ef2813bf4
Branches Tags
WMDE:main
..
compare: WMDE:7966a0253026db6d185d1ceabe75ed2bf10efd40
Branches Tags
WMDE:main

No commits in common. "dcf16d21b489614a90c507df667a4d3ef2813bf4" and "7966a0253026db6d185d1ceabe75ed2bf10efd40" have entirely different histories.
dcf16d21b4 ... 7966a02530

7 changed files with 36 additions and 127 deletions
Show Stats Expand all files Collapse all files

3
certbot.cf
View File

@ -63,7 +63,6 @@ bundle agent certbot_cert(site,webroot)
vars: vars:
"domain" string => "$(site[domain])"; "domain" string => "$(site[domain])";
"keytype" string => "rsa";
"ds" slist => {"$(site[domain])"}; "ds" slist => {"$(site[domain])"};
@ -71,7 +70,7 @@ vars:
"site_json" string => storejson(@(site)); "site_json" string => storejson(@(site));
"args" string => string_mustache( "args" string => string_mustache(
"--key-type $(keytype) --cert-name {{domain}} -d {{domain}} {{#aliases}} -d {{.}} {{/aliases}}", "--cert-name {{domain}} -d {{domain}} {{#aliases}} -d {{.}} {{/aliases}}",
@(site) @(site)
); );

2
dovecot.cf
View File

@ -120,7 +120,7 @@ reports:
bundle agent dovecot_vimbadmin_sql(cfg,dovecot_cfg) bundle agent dovecot_vimbadmin_sql(cfg)
{ {
vars: vars:
"cfg_file" string => "$(sys.workdir)/data/agent/dovecot/vimbadmin-sql.comf"; "cfg_file" string => "$(sys.workdir)/data/agent/dovecot/vimbadmin-sql.comf";

33
lib.cf
View File

@ -215,17 +215,12 @@ vars:
methods: methods:
do_install:: do_install::
"any" usebundle => install_wget;
"any" usebundle => wmde_install_packages(@(pkgs),"apt_repo"); "any" usebundle => wmde_install_packages(@(pkgs),"apt_repo");
commands: commands:
do_install:: do_install::
"/bin/sh" "/bin/sh"
args => "$(sys.workdir)/inputs/$(def.wmde_libdir)/scripts/install-php-repo.sh $(name) $(repo_src) $(key_src) $(key_name)", args => "$(sys.workdir)/inputs/$(def.wmde_libdir)/scripts/install-php-repo.sh $(name) $(repo_src) $(key_src) $(key_name)";
depends_on => {
"wget_pkgs_installed",
"apt_repo_pkgs_installed"
};
} }
@ -253,33 +248,19 @@ bundle agent install_system_repos
classes: classes:
centos:: centos::
"centos_9_and_later" expression => isgreaterthan("$(sys.os_version_major)", "8") ; "centos_9_and_later" expression => isgreaterthan("$(sys.os_version_major)", "8") ;
commands:
vars: vars:
# centos:: "pkgs" slist => {};
# "pkgs" slist => {
# "epel-release"
# };
# !centos::
# "pkgs" slist => {},
# handle => "system_repos_pkgs_installed";
commands:
centos:: centos::
"/usr/bin/yum" "pkgs" slist => {
args => "install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-$(sys.os_version_major).noarch.rpm", "epel-release"
if => not(returnszero("rpm -q epel-release > /dev/null","useshell")), };
handle=>"system_repos_pkgs_installed"; commands:
centos_9_and_later:: centos_9_and_later::
"/usr/bin/dnf" "/usr/bin/dnf"
inform => "false", inform => "false",
args => "config-manager --set-enabled crb"; args => "config-manager --set-enabled crb";
methods: methods:
# "any" usebundle => wmde_install_packages(@(pkgs),"system_repos"); "any" usebundle => wmde_install_packages(@(pkgs),"system_repos");
reports: reports:
} }

95
php.cf
View File

@ -5,8 +5,7 @@
bundle agent install_php bundle agent install_php
{ {
classes: classes:
"use_ext_repos"; "php_install_repo" expression => not(fileexists("/etc/apt/sources.list.d/php.list"));
vars: vars:
"version" string => "$(php.version)"; "version" string => "$(php.version)";
centos:: centos::
@ -64,23 +63,22 @@ vars:
}; };
centos:: centos::
"xversion" string => "";
"pkgs" slist => { "pkgs" slist => {
"php$(xversion)-cli", "php$(version)-cli",
"php$(xversion)-common", "php$(version)-common",
"php$(xversion)-pecl-zip", "php$(version)-pecl-zip",
"php$(xversion)-pgsql", "php$(version)-pgsql",
"php$(xversion)-mysqlnd", "php$(version)-mysqlnd",
"php$(xversion)-xml", "php$(version)-xml",
"php$(xversion)-gd", "php$(version)-gd",
"php$(xversion)-mbstring", "php$(version)-mbstring",
"php$(xversion)-intl", "php$(version)-intl",
"php$(xversion)-pecl-imagick-im6", "php$(version)-pecl-imagick",
"php$(xversion)-ldap", "php$(version)-ldap",
"php-pecl-json-post" "php-pecl-json-post"
}; };
# "php$(version)-curl",
commands: commands:
# (debian|ubuntu)&php_install_repo:: # (debian|ubuntu)&php_install_repo::
@ -96,62 +94,11 @@ commands:
methods: methods:
debian&use_ext_repos:: "any" usebundle => install_apt_repo("php","$(php.apt_repo_url)","$(php.apt_repo_key)","$(php.apt_repo_key_name)"),
"any" usebundle => install_apt_repo("php","$(php.apt_repo_url)","$(php.apt_repo_key)","$(php.apt_repo_key_name)"), handle => "php_repo_ready";
handle => "php_repo_ready";
centos::
"any" usebundle => php_install_centos_repos,
handle => "php_repo_ready";
any::
"any" usebundle => wmde_install_packages(@(pkgs),"php"), "any" usebundle => wmde_install_packages(@(pkgs),"php"),
depends_on => {"php_repo_ready"}; depends_on => {"php_repo_ready"};
commands:
}
bundle agent php_install_centos_repos
{
classes:
centos::
"switch_repo" expression => not(returnszero("cat /etc/dnf/modules.d/php.module | grep -q '^stream.*=.*remi-$(php.version)'","useshell"));
"install_remi" expression => not(returnszero("rpm -q remi-release > /dev/null","useshell"));
"install_epel" expression => not(returnszero("rpm -q epel-release > /dev/null","useshell"));
commands:
centos&install_epel::
"/usr/bin/yum"
args => "install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm",
handle => "php_epel_repo_installed";
centos&(!install_epel)::
"/usr/bin/true"
inform => "false",
handle => "php_epel_repo_installed";
centos&install_remi::
"/usr/bin/yum"
args => "install -y https://rpms.remirepo.net/enterprise/remi-release-$(sys.os_version_major).rpm",
depends_on => {"php_epel_repo_installed"},
handle => "php_remi_repo_installed";
centos&(!install_remi)::
"/usr/bin/true"
inform => "false",
handle => "php_remi_repo_installed";
centos&switch_repo::
"dnf" args => "module switch-to php:remi-$(php.version) -y",
contain => wmde_cmd_useshell,
depends_on => {"php_remi_repo_installed"};
methods:
} }
bundle agent php(settings) bundle agent php(settings)
@ -162,8 +109,8 @@ vars:
debian:: debian::
"version" string => "8.0"; "version" string => "8.0";
"ini_files" slist => { "ini_files" slist => {
# "/etc/php/$(php.version)/apache2/php.ini", "/etc/php/$(php.version)/apache2/php.ini",
# "/etc/php/$(php.version)/fpm/php.ini" "/etc/php/$(php.version)/fpm/php.ini"
}; };
"cli_exe" string => "/usr/bin/php"; "cli_exe" string => "/usr/bin/php";
@ -201,8 +148,8 @@ vars:
centos:: centos::
"cli_exe" string => "/usr/bin/php"; "cli_exe" string => "/usr/bin/php";
"version" string => "8.2"; "version" string => "";
"fpm_pkgs" slist => { "php-fpm" }; "fpm_pkgs" slist => { "php$(version)-fpm" };
"fpm_service_name" string => "php$(version)-fpm"; "fpm_service_name" string => "php$(version)-fpm";
"fpm_socket" string => "/run/php-fpm/www.sock"; "fpm_socket" string => "/run/php-fpm/www.sock";
@ -216,8 +163,8 @@ files:
classes => if_repaired(php_repaired); classes => if_repaired(php_repaired);
#methods: methods:
# "any" usebundle => install_php; "any" usebundle => install_php;
reports: reports:
"PHP VERSION: $(ini_files) V:$(install_php.version)"; "PHP VERSION: $(ini_files) V:$(install_php.version)";

12
scripts/install-php-repo.sh
View File

@ -1,7 +1,7 @@
#!/bin/sh !/bin/sh
# To add this repository please do: # To add this repository please do:
set -x
echo $1 $2 $3 echo $1 $2 $3
@ -9,10 +9,8 @@ echo "PARAMS $1 $2 $3"
if [ -n "$3" ]; then if [ -n "$3" ]; then
echo "it dollaar 3" echo "it dollaar 3"
wget -O /etc/apt/trusted.gpg.d/$1.gpg $3 curl -sSLo /usr/share/keyrings/$4 $3
echo "deb $2 $(lsb_release -sc) main" > /etc/apt/sources.list.d/$1.list echo "deb [signed-by=/usr/share/keyrings/$4] $2 $(lsb_release -sc) main" > /etc/apt/sources.list.d/$1.list
chmod 644 /etc/apt/sources.list.d/$1.list
chmod 644 /etc/apt/trusted.gpg.d/$1.gpg
else else
echo "its not $3" echo "its not $3"
@ -21,5 +19,5 @@ else
fi fi
apt-get update -y apt-get update

7
templates/dovecot/vimbadmin-sql.conf.mustache
View File

@ -6,10 +6,3 @@ password_query = \
homedir AS userdb_home, uid AS userdb_uid, gid AS userdb_gid \ homedir AS userdb_home, uid AS userdb_uid, gid AS userdb_gid \
FROM mailbox WHERE username = '%u' FROM mailbox WHERE username = '%u'
iterate_query = SELECT username AS user FROM mailbox iterate_query = SELECT username AS user FROM mailbox
user_query = \
SELECT 'maildir:~/Maildir' as mail, '{{vars.dovecot_vimbadmin_sql.dovecot_cfg.vmail_dir}}/%d/%n' as home, 1003 as gid, 1003 as uid FROM mailbox WHERE username = '%u'

11
vimbadmin.cf
View File

@ -11,11 +11,6 @@ classes:
"vimbadmin_restore_db" expression => fileexists("$(cfg[restore_db_file])"); "vimbadmin_restore_db" expression => fileexists("$(cfg[restore_db_file])");
vars: vars:
"pkgs" slist => {
"git"
};
"vsettings[resources.doctrine2.connection.options.driver]" string => "'$(cfg[db_driver])'"; "vsettings[resources.doctrine2.connection.options.driver]" string => "'$(cfg[db_driver])'";
"vsettings[resources.doctrine2.connection.options.dbname]" string => "'$(cfg[db_name])'"; "vsettings[resources.doctrine2.connection.options.dbname]" string => "'$(cfg[db_name])'";
"vsettings[resources.doctrine2.connection.options.user]" string => "'$(cfg[db_user])'"; "vsettings[resources.doctrine2.connection.options.user]" string => "'$(cfg[db_user])'";
@ -117,11 +112,8 @@ commands:
"/bin/sh" "/bin/sh"
# args => "-c 'cd $(cfg[install_dir]) && $(php_composer.exe) -q -n create-project --prefer-dist --no-dev opensolutions/vimbadmin'", # args => "-c 'cd $(cfg[install_dir]) && $(php_composer.exe) -q -n create-project --prefer-dist --no-dev opensolutions/vimbadmin'",
args => "-c 'cd $(cfg[install_dir]) && $(php_composer.exe) update -q --no-cache && $(php_composer.exe) install --no-cache -q --prefer-dist --no-dev", args => "-c 'cd $(cfg[install_dir]) && $(php_composer.exe) install -q --prefer-dist --no-dev",
handle => "vimbadmin_composed", handle => "vimbadmin_composed",
depends_on => {
"vimbadmin_pkgs_installed"
},
contain => vimbadmin_cmd; contain => vimbadmin_cmd;
#"/bin/sh" #"/bin/sh"
@ -135,7 +127,6 @@ commands:
methods: methods:
"any" usebundle => wmde_install_packages(@(pkgs),"vimbadmin");
"any" usebundle => php_composer; "any" usebundle => php_composer;
"any" usebundle => mysql_table_exists(@(cfg),"admin"); "any" usebundle => mysql_table_exists(@(cfg),"admin");