Skip to content

Properly handle systemd escaped characters #14

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.

Sign up for GitHub

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

Open
camara-tech wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Properly handle systemd escaped characters #14

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
36b38dd
(WIP) Properly handle systemd escaped characters
camara-tech Nov 11, 2019
8c52928
make the substitution global
camara-tech Nov 11, 2019
d837fbc
pipeline string changes.
camara-tech Nov 11, 2019
80eb948
handle presence of pool in the service name
camara-tech Nov 20, 2019
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
16 changes: 12 additions & 4 deletions manifests/agent.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
# The name of the Azure Pipelines or VSTS account.
# @param agent_name
# Unique name to identify the agent
# @param package_src
# @param package_src
# Source of the agent installation package. Supports all URIs supported by the archive module.
# @param package_sha512
# SHA-512 hash of the installation package, for verification.
Expand Down Expand Up @@ -78,7 +78,7 @@
# @param deployment_group_tags
# Tags for a deployment group agent.
# @param archive_name
# Destination filename for agent installation package.
# Destination filename for agent installation package.
# @param config_script
# Name of script file used to install the agent.
# @param manage_service
Expand Down Expand Up @@ -355,14 +355,22 @@
require => Archive["${install_path}/${archive_name}"],
}
if $facts['kernel'] == 'Linux' and $run_as_service {
$service_name_part = $pool ? {
undef => "${instance_name}.${agent_name}",
default => "${instance_name}.${pool}.${agent_name}"
}
exec {"${install_path}/svc.sh install ${service_user}":
creates => "/etc/systemd/system/vsts.agent.${instance_name}.${agent_name}.service",
onlyif => "/bin/systemctl list-unit-files \"$(/bin/systemd-escape --path vsts.agent.${service_name_part}.service)\" | /bin/grep \"$(/bin/systemd-escape --path vsts.agent.${service_name_part}.service)\"",
user => 'root',
cwd => $install_path,
require => Exec["${install_path}/${config_script}"],
}
if $manage_service {
service {"vsts.agent.${instance_name}.${agent_name}.service":
$escaped_dashes_in_service_name = regsubst("vsts.agent.${service_name_part}.service", '-', '\x2d', 'G')
$escaped_spaces_in_service_name = regsubst($escaped_dashes_in_service_name, ' ', '\x20', 'G')
$escaped_slashes_in_service_name = regsubst($escaped_spaces_in_service_name, '/', '-', 'G')
$escaped_service_name = $escaped_slashes_in_service_name
service { $escaped_service_name:
ensure => 'running',
require => Exec["${install_path}/svc.sh install ${service_user}"],
}
Expand Down