Compare commits
No commits in common. "cb163a4906cdde29db2ac90c837b17ddc70ed245" and "081219a8dc6c43d76e1684ec3875de41473f9ecd" have entirely different histories.
cb163a4906
...
081219a8dc
|
@ -113,9 +113,7 @@ vars:
|
||||||
$(php_mod)
|
$(php_mod)
|
||||||
{m:"ssl",f:"mod_ssl"},
|
{m:"ssl",f:"mod_ssl"},
|
||||||
{m:"proxy",f:"mod_proxy"},
|
{m:"proxy",f:"mod_proxy"},
|
||||||
{m:"proxy_fcgi",f:"mod_proxy_fcgi"},
|
{m:"proxy_fcgi",f:"mod_proxy_fcgi"}
|
||||||
{m:"proxy_http",f:"mod_proxy_http"},
|
|
||||||
{m:"proxy_http2",f:"mod_proxy_http2"}
|
|
||||||
]';
|
]';
|
||||||
# {m:"php",f:"libphp$(php.version)"},
|
# {m:"php",f:"libphp$(php.version)"},
|
||||||
|
|
||||||
|
@ -190,9 +188,8 @@ vars:
|
||||||
"log_dir_owner" string => "root";
|
"log_dir_owner" string => "root";
|
||||||
"log_dir_group" string => "adm";
|
"log_dir_group" string => "adm";
|
||||||
|
|
||||||
# {m:"$(phpm)",f:"libphp$(install_php.version)"},
|
|
||||||
"modules" data => '[
|
"modules" data => '[
|
||||||
$(php_mod)
|
{m:"$(phpm)",f:"libphp$(install_php.version)"},
|
||||||
{m:"proxy",f:"mod_proxy"},
|
{m:"proxy",f:"mod_proxy"},
|
||||||
{m:"proxy_http",f:"mod_proxy_http"},
|
{m:"proxy_http",f:"mod_proxy_http"},
|
||||||
{m: "autoindex",f:"mod_autoindex"},
|
{m: "autoindex",f:"mod_autoindex"},
|
||||||
|
|
|
@ -68,8 +68,8 @@ vars:
|
||||||
"cfg" data => mergedata(@(default_cfg),@(param_cfg));
|
"cfg" data => mergedata(@(default_cfg),@(param_cfg));
|
||||||
|
|
||||||
"roundcube_plugins" string => ifelse(strcmp("$(cfg[roundcube_password_recovery])","true"),
|
"roundcube_plugins" string => ifelse(strcmp("$(cfg[roundcube_password_recovery])","true"),
|
||||||
"['acl', 'archive', 'attachment_reminder', 'emoticons', 'hide_blockquote', 'identicon', 'jqueryui', 'managesieve', 'markasjunk', 'newmail_notifier', 'password', 'password_recovery', 'vcard_attachments', 'zipdownload']",
|
"['acl', 'archive', 'attachment_reminder', 'emoticons', 'enigma', 'hide_blockquote', 'identicon', 'jqueryui', 'managesieve', 'markasjunk', 'newmail_notifier', 'password', 'password_recovery', 'vcard_attachments', 'zipdownload']",
|
||||||
"['acl', 'archive', 'attachment_reminder', 'emoticons', 'hide_blockquote', 'identicon', 'jqueryui', 'managesieve', 'markasjunk', 'newmail_notifier', 'password', 'vcard_attachments', 'zipdownload']");
|
"['acl', 'archive', 'attachment_reminder', 'emoticons', 'enigma', 'hide_blockquote', 'identicon', 'jqueryui', 'managesieve', 'markasjunk', 'newmail_notifier', 'password', 'vcard_attachments', 'zipdownload']");
|
||||||
|
|
||||||
"mysql_cfg" data => '{
|
"mysql_cfg" data => '{
|
||||||
"settings":{
|
"settings":{
|
||||||
|
@ -421,7 +421,6 @@ virtual_transport = lmtp:unix:private/dovecot-lmtp
|
||||||
virtual_alias_maps = mysql:$(postfix_vimbadmin_sql.virtual_alias_maps)
|
virtual_alias_maps = mysql:$(postfix_vimbadmin_sql.virtual_alias_maps)
|
||||||
virtual_mailbox_domains = mysql:$(postfix_vimbadmin_sql.virtual_domains_maps)
|
virtual_mailbox_domains = mysql:$(postfix_vimbadmin_sql.virtual_domains_maps)
|
||||||
virtual_mailbox_maps = mysql:$(postfix_vimbadmin_sql.virtual_mailbox_maps)
|
virtual_mailbox_maps = mysql:$(postfix_vimbadmin_sql.virtual_mailbox_maps)
|
||||||
inet_protocols = ipv4
|
|
||||||
|
|
||||||
"
|
"
|
||||||
,
|
,
|
||||||
|
|
2
mysql.cf
2
mysql.cf
|
@ -48,8 +48,6 @@ vars:
|
||||||
"user" string => "mysql";
|
"user" string => "mysql";
|
||||||
"server_pkgs" slist => {"mariadb-server"};
|
"server_pkgs" slist => {"mariadb-server"};
|
||||||
"client_pkgs" slist => {"mariadb-client"};
|
"client_pkgs" slist => {"mariadb-client"};
|
||||||
"server_pkgs" slist => {"MariaDB-server"};
|
|
||||||
"client_pkgs" slist => {"MariaDB-client"};
|
|
||||||
"type" string => "mariadb";
|
"type" string => "mariadb";
|
||||||
"service_name" string => "mariadb";
|
"service_name" string => "mariadb";
|
||||||
"cfg_dir" string => "/etc/mysql";
|
"cfg_dir" string => "/etc/mysql";
|
||||||
|
|
|
@ -245,8 +245,7 @@ vars:
|
||||||
|
|
||||||
"settings[db_dsnw]" string => "'mysql://$(cfg[db_user]):$(cfg[db_pass])@$(cfg[db_host])/$(cfg[db_name])'";
|
"settings[db_dsnw]" string => "'mysql://$(cfg[db_user]):$(cfg[db_pass])@$(cfg[db_host])/$(cfg[db_name])'";
|
||||||
"settings[language]" string => "'us_EN'";
|
"settings[language]" string => "'us_EN'";
|
||||||
# enigma disabled
|
"settings[plugins]" string => "['acl', 'archive', 'attachment_reminder', 'emoticons', 'enigma', 'hide_blockquote', 'identicon', 'jqueryui', 'managesieve', 'markasjunk', 'newmail_notifier', 'password', 'vcard_attachments', 'zipdownload']";
|
||||||
"settings[plugins]" string => "['acl', 'archive', 'attachment_reminder', 'emoticons', 'hide_blockquote', 'identicon', 'jqueryui', 'managesieve', 'markasjunk', 'newmail_notifier', 'password', 'vcard_attachments', 'zipdownload']";
|
|
||||||
|
|
||||||
"idx" slist => getindices(@(cfg[settings]));
|
"idx" slist => getindices(@(cfg[settings]));
|
||||||
"settings[$(idx)]" string => "$(cfg[settings][$(idx)])";
|
"settings[$(idx)]" string => "$(cfg[settings][$(idx)])";
|
||||||
|
|
Loading…
Reference in New Issue