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

Compare commits

base: WMDE:07aec23f94e4e7effbdcdcddb04627e34c7d8e89
Branches Tags
WMDE:main
..
compare: WMDE:d5f1f7f8a03a75e8ff6f83a180c92685eb825ef1
Branches Tags
WMDE:main

No commits in common. "07aec23f94e4e7effbdcdcddb04627e34c7d8e89" and "d5f1f7f8a03a75e8ff6f83a180c92685eb825ef1" have entirely different histories.
07aec23f94 ... d5f1f7f8a0

2 changed files with 15 additions and 61 deletions
Show Stats Expand all files Collapse all files

26
lib.cf
View File

@ -107,35 +107,13 @@ body service_method wmde
bundle agent wmde_service(service_name,start_cond, restart_cond) bundle agent wmde_service(service_name,start_cond, restart_cond)
{ {
classes:
freebsd::
"service_running" expression => returnszero("/usr/sbin/service $(service_name) onestatus >/dev/null 2>&1", "useshell");
commands:
"freebsd&(!service_running)&($(start_cond))"::
"/usr/sbin/service"
args => "$(service_name) onestart >/dev/null 2>&1",
contain => wmde_cmd_useshell,
handle => "$(handle)_service_started";
"freebsd&(service_running)&($(start_cond))"::
"/usr/bin/true"
inform => "false",
handle => "$(handle)_service_started";
"freebsd&($(restart_cond))"::
"/usr/sbin/service"
args => "$(service_name) onerestart >/dev/null 2>&1",
contain => wmde_cmd_useshell,
handle => "$(handle)_service_restarted";
services: services:
"(!freebsd)&($(start_cond))":: "$(start_cond)"::
"$(service_name)" "$(service_name)"
service_policy => "start", service_policy => "start",
handle => "$(handle)_service_started"; handle => "$(handle)_service_started";
"(!freebsd)&($(restart_cond))":: "$(restart_cond)"::
"$(service_name)" "$(service_name)"
service_policy => "restart", service_policy => "restart",
handle => "$(handle)_service_restarted"; handle => "$(handle)_service_restarted";

50
strongswan.cf
View File

@ -5,30 +5,12 @@
bundle agent strongswan bundle agent strongswan
{ {
vars: vars:
freebsd:: "ipsec_conf" string => "/etc/ipsec.conf";
"pkgs" slist => { "ipsec_secrets" string => "/etc/ipsec.secrets";
"strongswan" "service_name" string => "ipsec";
}; "pkgs" slist => {
"ipsec_conf" string => "/usr/local/etc/ipsec.conf"; "strongswan"
"ipsec_secrets" string => "/usr/local/etc/ipsec.secrets"; };
"service_name" string => "strongswan";
debian::
"pkgs" slist => {
"strongswan"
};
"ipsec_conf" string => "/etc/ipsec.conf";
"ipsec_secrets" string => "/etc/ipsec.secrets";
"service_name" string => "ipsec";
centos::
"pkgs" slist => {
"strongswan"
};
"ipsec_conf" string => "/etc/strongswan/ipsec.conf";
"ipsec_secrets" string => "/etc/strongswan/ipsec.secrets";
"service_name" string => "strongswan-starter";
} }
@ -36,15 +18,15 @@ vars:
bundle agent install_strongswan(cfg) bundle agent install_strongswan(cfg)
{ {
vars: vars:
"service_deps" slist => { "strongswan_ipsec_conf_ready", "strongswan_ipsec_secrets_ready" }; "js" string => storejson(@(cfg));
freebsd::
"service_deps" slist => { "strongswan_ipsec_conf_ready", "strongswan_ipsec_secrets_ready","strongswan_bsdcfg_ready" };
methods: methods:
"any" usebundle => wmde_install_packages(@(strongswan.pkgs),"strongswan"); "any" usebundle => wmde_install_packages(@(strongswan.pkgs),"strongswan");
"any" usebundle => wmde_service("$(strongswan.service_name)","strongswan_kept","strongswan_repaired"), "any" usebundle => wmde_service("$(strongswan.service_name)","strongswan_kept","strongswan_repaired"),
depends_on => @(service_deps); depends_on => {
"strongswan_ipsec_conf_ready",
"strongswan_ipsec_secrets_ready"
};
files: files:
"$(strongswan.ipsec_conf)" "$(strongswan.ipsec_conf)"
create => "true", create => "true",
@ -64,14 +46,8 @@ files:
classes => if_repaired("strongswan_repaired"), classes => if_repaired("strongswan_repaired"),
edit_template => "$(sys.workdir)/inputs/$(def.wmde_libdir)/templates/strongswan-ipsec.secrets.mustache"; edit_template => "$(sys.workdir)/inputs/$(def.wmde_libdir)/templates/strongswan-ipsec.secrets.mustache";
freebsd::
"/etc/rc.conf.d/strongswan"
create => "true",
content =>"strongswan_interface=stroke
strongswan_enable=\"YES\"
",
handle => "strongswan_bsdcfg_ready";
reports: reports:
} }