diff --git a/ansible/roles/certstore/templates/service_override_env.conf.j2 b/ansible/roles/certstore/templates/service_override_env.conf.j2 index 4d73ff5f..2119b2a7 100644 --- a/ansible/roles/certstore/templates/service_override_env.conf.j2 +++ b/ansible/roles/certstore/templates/service_override_env.conf.j2 @@ -1,2 +1,2 @@ [Service] -Environment=HASPUSER_PREFIX=/etc/tsg/licence/ \ No newline at end of file +Environment=HASPUSER_PREFIX=/etc/haspuser/ \ No newline at end of file diff --git a/ansible/roles/hasp/files/aksusbd-8.23-1.x86_64.rpm b/ansible/roles/hasp/files/aksusbd-8.31-1.x86_64.rpm similarity index 51% rename from ansible/roles/hasp/files/aksusbd-8.23-1.x86_64.rpm rename to ansible/roles/hasp/files/aksusbd-8.31-1.x86_64.rpm index 392efeca..4c22406c 100644 Binary files a/ansible/roles/hasp/files/aksusbd-8.23-1.x86_64.rpm and b/ansible/roles/hasp/files/aksusbd-8.31-1.x86_64.rpm differ diff --git a/ansible/roles/hasp/files/hasp.sh b/ansible/roles/hasp/files/hasp.sh index 0127b683..4f1a620c 100644 --- a/ansible/roles/hasp/files/hasp.sh +++ b/ansible/roles/hasp/files/hasp.sh @@ -1 +1 @@ -export HASPUSER_PREFIX=/etc/tsg/licence/ \ No newline at end of file +export HASPUSER_PREFIX=/etc/haspuser/ \ No newline at end of file diff --git a/ansible/roles/hasp/files/hasp_25743.ini b/ansible/roles/hasp/files/hasp_25743.ini new file mode 100644 index 00000000..129822d8 --- /dev/null +++ b/ansible/roles/hasp/files/hasp_25743.ini @@ -0,0 +1,8 @@ +disable_IPv6 = 1 +requestlog = 0 +errorlog = 0 +getinfo_uncached = 1 +load_balancing = server +broadcastsearch = 0 +#serveraddr = 192.168.41.23 +#serveraddr = 192.168.41.22 diff --git a/ansible/roles/hasp/tasks/main.yml b/ansible/roles/hasp/tasks/main.yml index 7c85e134..43d5a018 100644 --- a/ansible/roles/hasp/tasks/main.yml +++ b/ansible/roles/hasp/tasks/main.yml @@ -1,6 +1,6 @@ - name: "aksusbd rpm install: copy file to device" copy: - src: '{{ role_path }}/files/aksusbd-8.23-1.x86_64.rpm' + src: '{{ role_path }}/files/aksusbd-8.31-1.x86_64.rpm' dest: /tmp/ansible_deploy/ - name: "download rpm packages: hasp_tools" @@ -15,10 +15,15 @@ - name: "aksusbd rpm install: install aksusbd" yum: name: - - "/tmp/ansible_deploy/aksusbd-8.23-1.x86_64.rpm" + - "/tmp/ansible_deploy/aksusbd-8.31-1.x86_64.rpm" state: present disable_gpg_check: yes +- name: "disable aksusbd.service" + systemd: + name: aksusbd.service + enabled: no + - name: "Get hasp_tools rpm path" find: path: /tmp/rpm_download/ @@ -40,13 +45,33 @@ - /usr/lib/systemd/system/hasp_monitor.service when: runtime_env != 'TSG-X-P0906' -- name: "Create /etc/tsg/licence/ directory if it does not exist" +- name: "Create /usr/lib/systemd/system/hasp_monitor.service.d/ directory if it does not exist" file: path: "{{ item }}" state: directory mode: '0755' with_items: - - /etc/tsg/licence/ + - /usr/lib/systemd/system/hasp_monitor.service.d + +- name: "copy env file to hasp_monitor.service.d" + copy: + src: "{{ role_path }}/templates/service_override_env.conf.j2" + dest: /usr/lib/systemd/system/hasp_monitor.service.d/service_override_env.conf + mode: 0644 + +- name: "Create /etc/haspuser/ directory if it does not exist" + file: + path: "{{ item }}" + state: directory + mode: '0755' + with_items: + - /etc/haspuser/ + +- name: "copy hasp_25743.ini to /etc/haspuser/" + copy: + src: "{{ role_path }}/files/hasp_25743.ini" + dest: /etc/haspuser/ + mode: 0644 - name: "copy hasp.sh to /etc/profile.d/" copy: @@ -58,3 +83,4 @@ systemd: name: hasp_monitor.service enabled: yes + when: runtime_env == 'TSG-X-P0906' \ No newline at end of file diff --git a/ansible/roles/hasp/templates/service_override_env.conf.j2 b/ansible/roles/hasp/templates/service_override_env.conf.j2 new file mode 100644 index 00000000..2119b2a7 --- /dev/null +++ b/ansible/roles/hasp/templates/service_override_env.conf.j2 @@ -0,0 +1,2 @@ +[Service] +Environment=HASPUSER_PREFIX=/etc/haspuser/ \ No newline at end of file diff --git a/ansible/roles/sapp/templates/service_override_env.conf.j2 b/ansible/roles/sapp/templates/service_override_env.conf.j2 index b5b92008..46085d60 100644 --- a/ansible/roles/sapp/templates/service_override_env.conf.j2 +++ b/ansible/roles/sapp/templates/service_override_env.conf.j2 @@ -1,3 +1,3 @@ [Service] Environment="ZLOG_PROFILE_ERROR=/var/log/zlog.error.log" -Environment=HASPUSER_PREFIX=/etc/tsg/licence/ \ No newline at end of file +Environment=HASPUSER_PREFIX=/etc/haspuser/ \ No newline at end of file diff --git a/ansible/roles/tfe/templates/service_override_env.conf.j2 b/ansible/roles/tfe/templates/service_override_env.conf.j2 index 4d73ff5f..2119b2a7 100644 --- a/ansible/roles/tfe/templates/service_override_env.conf.j2 +++ b/ansible/roles/tfe/templates/service_override_env.conf.j2 @@ -1,2 +1,2 @@ [Service] -Environment=HASPUSER_PREFIX=/etc/tsg/licence/ \ No newline at end of file +Environment=HASPUSER_PREFIX=/etc/haspuser/ \ No newline at end of file