imfreedom/ansible

fix up a bunch of stuff for freebsd

2021-07-23, Gary Kramlich
3f7fbabaa0d5
Parents 0090d4b9ebc5
Children 285e600b7c99
fix up a bunch of stuff for freebsd
4 files changed, 44 insertions(+), 30 deletions(-)
  • +2 -2
    roles/pidgin3-dependencies/tasks/freebsd.yml
  • +2 -27
    roles/teamcity/tasks/freebsd.yml
  • +39 -0
    roles/teamcity/templates/freebsd-init
  • +1 -1
    roles/update/tasks/freebsd.yml
    • --- a/roles/pidgin3-dependencies/tasks/freebsd.yml Wed Jul 07 02:16:25 2021 -0500
    +++ b/roles/pidgin3-dependencies/tasks/freebsd.yml Fri Jul 23 15:38:29 2021 -0500
    @@ -12,7 +12,7 @@
    - help2man
    - json-glib
    - libcanberra
    - - libhandy-1.0.3
    + - libhandy
    - libidn
    - libsoup
    - lua52
    @@ -21,7 +21,7 @@
    - p5-Glib
    - p5-Glib-Object-Introspection
    - pkgconf
    - - py37-gobject3
    + - py38-gobject3
    - python3
    - silc-toolkit
    - vala
    --- a/roles/teamcity/tasks/freebsd.yml Wed Jul 07 02:16:25 2021 -0500
    +++ b/roles/teamcity/tasks/freebsd.yml Fri Jul 23 15:38:29 2021 -0500
    @@ -5,34 +5,9 @@
    state: absent
    - name: install init script
    - copy:
    + template:
    + src: freebsd-init
    dest: /usr/local/etc/rc.d/teamcity_agent
    - content: |
    - #!/bin/sh
    -
    - # PROVIDE: teamcity-agent
    - # REQUIRE: DAEMON
    -
    - . /etc/rc.subr
    -
    - name="teamcity_agent"
    - rcvar="teamcity_agent_enable"
    -
    - load_rc_config "${name}"
    -
    - : ${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/{{teamcity_jdk_version}}/bin/java"
    -
    - command="/usr/sbin/daemon"
    - command_args="-S -f -p ${pidfile} /usr/bin/env ${teamcity_agent_env} ${procname} -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"
    -
    - run_rc_command "$1"
    mode: '0555'
    - name: restart agent
    --- /dev/null Thu Jan 01 00:00:00 1970 +0000
    +++ b/roles/teamcity/templates/freebsd-init Fri Jul 23 15:38:29 2021 -0500
    @@ -0,0 +1,39 @@
    +#!/bin/sh
    +
    +# PROVIDE: teamcity-agent
    +# REQUIRE: DAEMON
    +
    +. /etc/rc.subr
    +
    +name="teamcity_agent"
    +rcvar="teamcity_agent_enable"
    +
    +load_rc_config "${name}"
    +
    +: ${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/{{teamcity_jdk_version}}/bin/java"
    +
    +command="/usr/sbin/daemon"
    +command_args="-S -f -p ${pidfile} /usr/bin/env ${teamcity_agent_env} ${procname} -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"
    +
    +teamcity_agent_start_precmd() {
    + piddir=$(dirname ${pidfile})
    + if [ ! -d ${piddir} ]; then
    + install -o ${teamcity_agent_user} -g ${teamcity_agent_group} -d ${piddir}
    + fi
    +
    + if [ ! -e ${pidfile} ]; then
    + install -o ${teamcity_agent_user} -g ${teamcity_agent_group} -m 644 /dev/null ${pidfile}
    + fi
    +}
    +
    +start_precmd=teamcity_agent_start_precmd
    +
    +run_rc_command "$1"
    +
    --- a/roles/update/tasks/freebsd.yml Wed Jul 07 02:16:25 2021 -0500
    +++ b/roles/update/tasks/freebsd.yml Fri Jul 23 15:38:29 2021 -0500
    @@ -2,7 +2,7 @@
    # https://github.com/fxlv/ansible/blob/master/tasks/freebsd-update.yml
    ---
    - name: fetch updates
    - shell: freebsd-update fetch
    + shell: freebsd-update --not-running-from-cron fetch
    register: result_update
    changed_when: "'No updates needed' not in result_update.stdout"
    when: ansible_architecture != 'arm64'