certbot.cf

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

dovecot.cf

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

lib.cf

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

php.cf

@@ -5,8 +5,7 @@
 bundle agent install_php
 {
 classes:
-	"use_ext_repos";
-
+	"php_install_repo" expression => not(fileexists("/etc/apt/sources.list.d/php.list"));
 vars:
 	"version" string => "$(php.version)";
 	centos::
@@ -64,23 +63,22 @@ vars:
 		};
 
 	centos::
-		"xversion" string => "";
 		"pkgs" slist => {
-			"php$(xversion)-cli",
-			"php$(xversion)-common",
-			"php$(xversion)-pecl-zip",
-			"php$(xversion)-pgsql",
-			"php$(xversion)-mysqlnd",
-			"php$(xversion)-xml",
-			"php$(xversion)-gd",
-			"php$(xversion)-mbstring",
-			"php$(xversion)-intl",
-			"php$(xversion)-pecl-imagick-im6",
-			"php$(xversion)-ldap",
+			"php$(version)-cli",
+			"php$(version)-common",
+			"php$(version)-pecl-zip",
+			"php$(version)-pgsql",
+			"php$(version)-mysqlnd",
+			"php$(version)-xml",
+			"php$(version)-gd",
+			"php$(version)-mbstring",
+			"php$(version)-intl",
+			"php$(version)-pecl-imagick",
+			"php$(version)-ldap",
 			"php-pecl-json-post"
 			
 		};
-
+	#		"php$(version)-curl",
 
 commands:
 #	(debian|ubuntu)&php_install_repo::
@@ -96,62 +94,11 @@ commands:
 
 
 methods:
-	debian&use_ext_repos::
-		"any" usebundle => install_apt_repo("php","$(php.apt_repo_url)","$(php.apt_repo_key)","$(php.apt_repo_key_name)"),
-			handle => "php_repo_ready";
+	"any" usebundle => install_apt_repo("php","$(php.apt_repo_url)","$(php.apt_repo_key)","$(php.apt_repo_key_name)"),
+		handle => "php_repo_ready";
 
-	centos::
-		"any" usebundle => php_install_centos_repos,
-			handle => "php_repo_ready";
-
-
-	any::
 	"any" usebundle => wmde_install_packages(@(pkgs),"php"),
 		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)
@@ -162,8 +109,8 @@ vars:
 	debian::
 		"version" string => "8.0";
 		"ini_files" slist => {
-#			"/etc/php/$(php.version)/apache2/php.ini",
-#			"/etc/php/$(php.version)/fpm/php.ini"
+			"/etc/php/$(php.version)/apache2/php.ini",
+			"/etc/php/$(php.version)/fpm/php.ini"
 		};
 
 		"cli_exe" string => "/usr/bin/php";
@@ -201,8 +148,8 @@ vars:
 
 	centos::
 		"cli_exe" string => "/usr/bin/php";
-		"version" string => "8.2";
-		"fpm_pkgs" slist => { "php-fpm" };
+		"version" string => "";
+		"fpm_pkgs" slist => { "php$(version)-fpm" };
 		"fpm_service_name" string => "php$(version)-fpm";
 		"fpm_socket" string => "/run/php-fpm/www.sock";
 
@@ -216,8 +163,8 @@ files:
 	classes => if_repaired(php_repaired);
 
 
-#methods:
-#	"any" usebundle => install_php;
+methods:
+	"any" usebundle => install_php;
 reports:
 	"PHP VERSION: $(ini_files) V:$(install_php.version)";
 

scripts/install-php-repo.sh

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

templates/dovecot/vimbadmin-sql.conf.mustache

@@ -6,10 +6,3 @@ password_query = \
     homedir AS userdb_home, uid AS userdb_uid, gid AS userdb_gid \
   FROM mailbox WHERE username = '%u'
 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'
-
-
-
-

vimbadmin.cf

@@ -11,11 +11,6 @@ classes:
 		"vimbadmin_restore_db" expression => fileexists("$(cfg[restore_db_file])");
 
 vars:
-	"pkgs" slist => {
-		"git"
-	};
-
-
 	"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.user]" string => "'$(cfg[db_user])'";
@@ -117,11 +112,8 @@ commands:
 
 		"/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) 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",
-		depends_on => {
-			"vimbadmin_pkgs_installed"
-		},
 		contain => vimbadmin_cmd;
 
 		#"/bin/sh"
@@ -135,7 +127,6 @@ commands:
 			
 
 methods:
-	"any" usebundle => wmde_install_packages(@(pkgs),"vimbadmin");
 	"any" usebundle => php_composer;
 	"any" usebundle => mysql_table_exists(@(cfg),"admin");