Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bugfixes #5

Merged
merged 4 commits into from
Aug 4, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"settings": {
"terminal.integrated.profiles.linux": {
"bash": {
"path": "bash",
"path": "bash"
}
}
},
Expand Down
27 changes: 18 additions & 9 deletions manifests/docker.pp
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,16 @@
include docker
}

group { $hdm::group:
ensure => present,
}

user { $hdm::user:
ensure => present,
gid => $hdm::group,
shell => '/sbin/nologin',
}

$directories = [
$hdm::hdm_path,
"${hdm::hdm_path}/certs",
Expand Down Expand Up @@ -41,20 +51,19 @@
}

docker::run { 'hdm':
image => "ghcr.io/betadots/hdm:${hdm::version}",
env => [
"TZ=${facts['timezone']}",
"RAILS_DEVELOPMENT_HOSTS=${facts['networking']['fqdn']}",
image => "ghcr.io/betadots/hdm:${hdm::version}",
env => [
"TZ=${$hdm::timezone}",
"RAILS_DEVELOPMENT_HOSTS=${hdm::hostname}",
],
volumes => [
volumes => [
"${hdm::hdm_path}:${hdm::hdm_path}",
"${hdm::puppet_code_dir}:${hdm::puppet_code_dir}:ro",
"${hdm::hdm_path}/hdm.yml:/hdm/config/hdm.yml:ro",
"${hdm::hdm_path}/database.yml:/hdm/config/database.yml:ro",
],
hostname => $hdm::hostname,
ports => [$hdm::port],
net => 'host',
extra_parameters => ["--user ${hdm::user}:${hdm::group}"],
hostname => $hdm::hostname,
ports => [$hdm::port],
net => 'host',
}
}
3 changes: 3 additions & 0 deletions manifests/init.pp
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@
#
# @param hostname The hostname to use
#
# @param timezone THe timezone to use when running with docker
#
# @param hdm_path Path where one wants to install and configure hdm
#
# @param git_url The git URL to clone the hdm repo from
Expand Down Expand Up @@ -113,6 +115,7 @@
Stdlib::Port $port = 3000,
Stdlib::IP::Address::Nosubnet $bind_ip = '0.0.0.0',
String[1] $hostname = $facts['networking']['fqdn'],
String[1] $timezone = $facts['timezone'],
Stdlib::Unixpath $hdm_path = '/etc/hdm',
String[1] $user = 'hdm',
String[1] $group = 'hdm',
Expand Down
2 changes: 1 addition & 1 deletion metadata.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "betadots-hdm",
"version": "1.0.1",
"version": "1.0.2",
"author": "betadots GmbH",
"summary": "Manage Hiera Data Manager application",
"license": "Apache-2.0",
Expand Down