imfreedom/teamcity-ansible

update the freebsd init script with the fixes that swills came up with

2019-11-13, Gary Kramlich
8726c1e8d279
Parents f8534c908d84
Children 0b63d4078ad9
update the freebsd init script with the fixes that swills came up with
1 files changed, 16 insertions(+), 17 deletions(-)
  • +16 -17
    roles/teamcity/tasks/freebsd.yml
    • --- a/roles/teamcity/tasks/freebsd.yml Sun Nov 10 05:02:05 2019 -0600
    +++ b/roles/teamcity/tasks/freebsd.yml Wed Nov 13 22:45:46 2019 -0600
    @@ -4,9 +4,14 @@
    name: unzip
    state: present
    +- name: delete old init script
    + file:
    + path: /usr/local/etc/rc.d/teamcity-agent
    + state: absent
    +
    - name: install init script
    copy:
    - dest: /usr/local/etc/rc.d/teamcity-agent
    + dest: /usr/local/etc/rc.d/teamcity_agent
    content: |
    #!/bin/sh
    @@ -18,31 +23,25 @@
    name="teamcity_agent"
    rcvar="teamcity_agent_enable"
    - start_cmd=teamcity_agent_start_cmd
    - stop_cmd=teamcity_agent_stop_cmd
    -
    - teamcity_agent_user="{{teamcity_user}}"
    - teamcity_agent_group="{{teamcity_group}}"
    + load_rc_config "${name}"
    - teamcity_agent_start_cmd() {
    - checkyesno teamcity_agent_enable && {{teamcity_agent_home}}bin/agent.sh start
    - }
    -
    - teamcity_agent_stop_cmd() {
    - checkyesno teamcity_agent_enable && {{teamcity_agent_home}}bin/agent.sh stop
    - }
    + : ${teamcity_agent_enable:="NO"}
    + : ${teamcity_agent_user:="{{teamcity_user}}"}
    + : ${teamcity_agent_group:="{{teamcity_group}}"}
    + : ${teamcity_agent_home:="{{teamcity_agent_home}}"}
    PATH="$PATH:/usr/local/bin"
    + pidfile="{{teamcity_agent_home}}logs/buildAgent.pid"
    + procname="/usr/local/openjdk11/bin/java"
    - pidfile="{{teamcity_agent_home}}logs/buildAgent.pid"
    + command="/usr/sbin/daemon"
    + command_args="-S -f -p ${pidfile} /usr/bin/env ${teamcity_agent_env} /usr/local/openjdk11/bin/java -ea -Xms16m -Xmx64m -cp ${teamcity_agent_home}/launcher/lib/launcher.jar jetbrains.buildServer.agent.Launcher -ea -Xmx384m -Dteamcity_logs=${teamcity_agent_home}/logs/ -Dlog4j.configuration=file:${teamcity_agent_home}/conf/teamcity-agent-log4j.xml jetbrains.buildServer.agent.AgentMain -file ${teamcity_agent_home}/conf/buildAgent.properties"
    - load_rc_config "${name}"
    run_rc_command "$1"
    mode: '0555'
    - name: restart agent
    service:
    - name: teamcity-agent
    + name: teamcity_agent
    state: restarted
    enabled: yes
    -