WIP dirsrv changes

This commit is contained in:
Basti 2021-12-02 13:56:23 -06:00
parent 685deea920
commit da3a70ef4c
Signed by untrusted user: basti
GPG Key ID: 9F88009D31D99C72
4 changed files with 16 additions and 9 deletions

View File

@ -1,22 +1,24 @@
{ {
"name": "ldap-1", "name": "ldap-1.kosmos.org",
"normal": { "normal": {
"knife_zero": { "knife_zero": {
"host": "10.1.1.63" "host": "10.1.1.63"
} }
}, },
"automatic": { "automatic": {
"fqdn": "ldap-1", "fqdn": "ldap-1.kosmos.org",
"os": "linux", "os": "linux",
"os_version": "5.4.0-1049-kvm", "os_version": "5.4.0-1049-kvm",
"hostname": "ldap-1", "hostname": "ldap-1",
"ipaddress": "192.168.122.164", "ipaddress": "192.168.122.164",
"roles": [ "roles": [
"dirsrv_primary"
], ],
"recipes": [ "recipes": [
"kosmos-base", "kosmos-base",
"kosmos-base::default", "kosmos-base::default",
"kosmos-dirsrv",
"kosmos-dirsrv::default",
"apt::default", "apt::default",
"timezone_iii::default", "timezone_iii::default",
"timezone_iii::debian", "timezone_iii::debian",
@ -30,7 +32,11 @@
"postfix::_common", "postfix::_common",
"postfix::_attributes", "postfix::_attributes",
"postfix::sasl_auth", "postfix::sasl_auth",
"hostname::default" "hostname::default",
"kosmos-dirsrv::firewall",
"backup::default",
"logrotate::default",
"ulimit::default"
], ],
"platform": "ubuntu", "platform": "ubuntu",
"platform_version": "20.04", "platform_version": "20.04",
@ -49,6 +55,6 @@
}, },
"run_list": [ "run_list": [
"recipe[kosmos-base]", "recipe[kosmos-base]",
"role[ldap]" "role[dirsrv_primary]"
] ]
} }

View File

@ -1,4 +1,4 @@
name "ldap" name "dirsrv_primary"
run_list %w( run_list %w(
recipe[kosmos-dirsrv] recipe[kosmos-dirsrv]

View File

@ -6,7 +6,7 @@
include_recipe "kosmos-base::firewall" include_recipe "kosmos-base::firewall"
firewall_rule "ldap" do firewall_rule "ldap" do
port [389, 636] port [389]
source "10.1.1.0/24" # zerotier source "10.1.1.0/24" # zerotier
protocol :tcp protocol :tcp
command :allow command :allow

View File

@ -1,4 +1,5 @@
resource_name :dirsrv_instance resource_name :dirsrv_instance
provides :dirsrv_instance
property :instance_name, String, name_property: true property :instance_name, String, name_property: true
property :hostname, String, required: true property :hostname, String, required: true
@ -45,7 +46,7 @@ action :create do
end end
execute "setup-#{new_resource.instance_name}" do execute "setup-#{new_resource.instance_name}" do
command "setup-ds --silent --file #{setup_config}" command "/usr/share/dirsrv/setup-ds.pl --silent --file #{setup_config}"
creates ::File.join inst_dir, 'dse.ldif' creates ::File.join inst_dir, 'dse.ldif'
action :nothing action :nothing
subscribes :run, "template[#{setup_config}]", :immediately subscribes :run, "template[#{setup_config}]", :immediately