diff options
| author | fumingwei <[email protected]> | 2020-10-19 20:55:52 +0800 |
|---|---|---|
| committer | fumingwei <[email protected]> | 2020-10-19 20:55:52 +0800 |
| commit | ed6f5c3d3b9fa7f07fa6105943eaaacee9c22471 (patch) | |
| tree | 4f34a313e295511af177b2b7a53b55adb7fe012b /roles/sapp | |
| parent | b0c9ea045b2753f02c4014018814f2a426027ed1 (diff) | |
| parent | 93fc4a94b8afdc78dd509faee0ecc7783a8a30fc (diff) | |
Merge branch 'tsg-version20.11.rc1-deploy-firewall' into tsg-version20.11.rc1-deploy
# Conflicts:
# roles/sapp/tasks/main.yml
更新firewall相关RPM包
Diffstat (limited to 'roles/sapp')
| -rw-r--r-- | roles/sapp/files/sapp-4.1.13.ed89137-2.el7.x86_64.rpm | bin | 0 -> 401044 bytes | |||
| -rw-r--r-- | roles/sapp/tasks/main.yml | 10 |
2 files changed, 2 insertions, 8 deletions
diff --git a/roles/sapp/files/sapp-4.1.13.ed89137-2.el7.x86_64.rpm b/roles/sapp/files/sapp-4.1.13.ed89137-2.el7.x86_64.rpm Binary files differnew file mode 100644 index 0000000..078dd04 --- /dev/null +++ b/roles/sapp/files/sapp-4.1.13.ed89137-2.el7.x86_64.rpm diff --git a/roles/sapp/tasks/main.yml b/roles/sapp/tasks/main.yml index 6e57f06..5472990 100644 --- a/roles/sapp/tasks/main.yml +++ b/roles/sapp/tasks/main.yml @@ -13,7 +13,7 @@ - name: "install sapp rpms from localhost" yum: name: - - /tmp/ansible_deploy/sapp-4.1.12.b8f6ea4-2.el7.x86_64.rpm + - /tmp/ansible_deploy/sapp-4.1.13.ed89137-2.el7.x86_64.rpm state: present skip_broken: yes @@ -51,13 +51,7 @@ template: src: "{{ role_path }}/templates/sapp.service.j2" dest: /usr/lib/systemd/system/sapp.service - mode: 0644 - -- name: "copy memory limit file to sapp.service.d" - copy: - src: "{{ role_path }}/files/memory.conf" - dest: /etc/systemd/system/sapp.service.d/ - mode: 0644 + mode: 0755 - name: "enable sapp" systemd: |