瀏覽代碼

Use the FreeBSD repository

Stephen Muth 8 年之前
父節點
當前提交
4997c01036
共有 4 個文件被更改,包括 25 次插入12 次删除
  1. 3 0
      handlers/main.yml
  2. 16 9
      tasks/FreeBSD/main.yml
  3. 5 0
      templates/sensu-freebsd-repo.conf.j2
  4. 1 3
      vars/FreeBSD.yml

+ 3 - 0
handlers/main.yml

@@ -47,3 +47,6 @@
       chdir: "{{ uchiwa_path }}/go/src/github.com/sensu/uchiwa"
     become: true
     become_user: "{{ sensu_user_name }}"
+
+  - name: Update pkgng database
+    command: /usr/sbin/pkg update

+ 16 - 9
tasks/FreeBSD/main.yml

@@ -16,6 +16,18 @@
       createhome: true
       state: present
 
+  - name: Create pkgng custom repo config directory
+    file:
+      path: /usr/local/etc/pkg/repos/
+      state: directory
+
+  - name: Install sensu repo
+    template:
+      src: sensu-freebsd-repo.conf.j2
+      dest: /usr/local/etc/pkg/repos/sensu.conf
+    notify:
+      - Update pkgng database
+
   - name: Install prerequisite packages
     pkgng:
       name: "{{ item }}"
@@ -24,12 +36,7 @@
       - bash
       - ca_root_nss
 
-  - name: Retrieve the sensu txz package
-    get_url:
-      url: "{{ sensu_pkg_download_url }}"
-      dest: "{{ sensu_pkg_download_path }}"
-    register: sensu_txz
-
-  - name: Install sensu from the retrieved txz package
-    command: "pkg add {{ sensu_pkg_download_path }}"
-    when: sensu_txz|changed
+  - name: Install sensu
+    pkgng:
+      name: "sensu{% if sensu_pkg_version %}-{{ sensu_pkg_version }}{% endif %}"
+      state: present

+ 5 - 0
templates/sensu-freebsd-repo.conf.j2

@@ -0,0 +1,5 @@
+sensu: {
+  url: "https://sensu.global.ssl.fastly.net/freebsd/FreeBSD:{{ ansible_distribution_major_version }}:{{ ansible_architecture }}/",
+  enabled: true,
+  mirror_type: "http"
+}

+ 1 - 3
vars/FreeBSD.yml

@@ -4,9 +4,7 @@
 
 # Sensu config/package properties
 sensu_config_path: /usr/local/etc/sensu
-sensu_pkg_version: 0.29.0_1
-sensu_pkg_download_url: https://sensu.global.ssl.fastly.net/freebsd/FreeBSD:{{ ansible_distribution_major_version }}:{{ ansible_architecture }}/sensu/sensu-{{ sensu_pkg_version }}.txz
-sensu_pkg_download_path: /root/sensu_latest.txz
+sensu_pkg_version: ~
 
 # RabbitMQ options
 rabbitmq_config_path: /usr/local/etc/rabbitmq