set rate-limit higher and let... #177

Merged
mg merged 13 commits from svc_user into master 2024-09-12 15:20:53 +02:00
10 changed files with 30 additions and 18 deletions

View file

@ -22,7 +22,7 @@ http:
ratelimit: ratelimit:
rateLimit: rateLimit:
average: 10 average: 10
burst: 5 burst: 15
sourceCriterion: sourceCriterion:
ipStrategy: ipStrategy:
depth: 2 depth: 2

View file

@ -7,6 +7,9 @@ file_header: |
#----------------------------------------------------------------# #----------------------------------------------------------------#
# This file is managed with ansible! # # This file is managed with ansible! #
#----------------------------------------------------------------# #----------------------------------------------------------------#
# für Zugriff auf nicht öffentliche git.mgrote.net-Repos
ansible_forgejo_user: svc_ansible
ansible_forgejo_user_pass: "{{ lookup('viczem.keepass.keepass', 'user_setup_forgejo_user_pass', 'password') }}" # user ist dem Repo als "Collaborator" + "RO" hinzugefügt worden
### mgrote_user_setup ### mgrote_user_setup
dotfiles: dotfiles:
@ -15,8 +18,7 @@ dotfiles:
- user: root - user: root
home: /root home: /root
dotfiles_repo_url: https://git.mgrote.net/mg/dotfiles dotfiles_repo_url: https://git.mgrote.net/mg/dotfiles
dotfiles_vim_vundle_repo_url: https://git.mgrote.net/mirrors/Vundle.vim.git dotfiles_vim_vundle_repo_url: "https://{{ ansible_forgejo_user | urlencode }}:{{ ansible_forgejo_user_pass | urlencode }}@git.mgrote.net/mirrors/Vundle.vim.git"
### mgrote_netplan ### mgrote_netplan
netplan_configure: true netplan_configure: true
@ -200,6 +202,8 @@ sanoid_templates:
sanoid_deb_url: http://docker10.mgrote.net:3344/sanoid_v2.2.0.deb sanoid_deb_url: http://docker10.mgrote.net:3344/sanoid_v2.2.0.deb
### mgrote_munin_node ### mgrote_munin_node
munin_node_plugins_repo_user: "{{ ansible_forgejo_user }}"
munin_node_plugins_repo_user_pass: "{{ ansible_forgejo_user_pass }}"
munin_node_bind_host: "0.0.0.0" munin_node_bind_host: "0.0.0.0"
munin_node_bind_port: "4949" munin_node_bind_port: "4949"
munin_node_allowed_cidrs: [192.168.2.0/24] munin_node_allowed_cidrs: [192.168.2.0/24]

View file

@ -24,7 +24,7 @@ apt_packages_extra:
- libnet-dns-perl # für munin: dnsresponse_ - libnet-dns-perl # für munin: dnsresponse_
### mgrote_user_setup ### mgrote_user_setup
dotfiles_vim_vundle_repo_url: http://192.168.2.42:3000/mirrors/Vundle.vim.git dotfiles_vim_vundle_repo_url: "http://{{ ansible_forgejo_user | urlencode }}:{{ ansible_forgejo_user_pass | urlencode }}@192.168.2.42:3000/mirrors/Vundle.vim.git"
dotfiles: dotfiles:
- user: mg - user: mg
home: /home/mg home: /home/mg

Binary file not shown.

View file

@ -1,15 +1,18 @@
--- ---
- name: download additional plugins - name: Ensure additional plugins are downloaded
ansible.builtin.get_url: ansible.builtin.get_url:
url: "{{ item.src }}" url: "{{ item.src }}"
dest: "{{ munin_plugin_src_path }}{{ item.name }}" dest: "{{ munin_plugin_src_path }}{{ item.name }}"
mode: '0755' mode: '0755'
url_username: "{{ munin_node_plugins_repo_user | default(omit) }}"
url_password: "{{ munin_node_plugins_repo_user_pass | default(omit) }}"
force_basic_auth: true
loop: "{{ munin_node_plugins }}" loop: "{{ munin_node_plugins }}"
notify: restart munin-node notify: restart munin-node
no_log: true no_log: true
check_mode: false # damit werden auch im check-mode die Plugins heruntergeladen, sonst schlägt der nächste Task fehl check_mode: false # damit werden auch im check-mode die Plugins heruntergeladen, sonst schlägt der nächste Task fehl
- name: enable additional plugins - name: Enable additional plugins
ansible.builtin.file: ansible.builtin.file:
src: "{{ munin_plugin_src_path }}{{ item.name }}" src: "{{ munin_plugin_src_path }}{{ item.name }}"
dest: "{{ munin_plugin_dest_path }}{{ item.name }}" dest: "{{ munin_plugin_dest_path }}{{ item.name }}"
@ -18,7 +21,7 @@
loop: "{{ munin_node_plugins }}" loop: "{{ munin_node_plugins }}"
no_log: true no_log: true
- name: copy additional plugin-config - name: Template additional plugin-config
ansible.builtin.copy: ansible.builtin.copy:
content: "{{ item.config }}" content: "{{ item.config }}"
dest: "{{ munin_plugin_conf_dest_path }}{{ item.name }}" dest: "{{ munin_plugin_conf_dest_path }}{{ item.name }}"
@ -30,7 +33,7 @@
when: item.config is defined when: item.config is defined
no_log: true no_log: true
- name: Ensure munin-node is running. - name: Ensure munin-node is running
ansible.builtin.service: ansible.builtin.service:
name: munin-node name: munin-node
state: started state: started

View file

@ -1,5 +1,5 @@
--- ---
- name: install packages - name: Ensure packages are installed
ansible.builtin.apt: ansible.builtin.apt:
name: munin-node name: munin-node
state: present state: present
@ -7,7 +7,7 @@
- munin-node-configure --shell - munin-node-configure --shell
- munin-node-configure --shell - 2 - munin-node-configure --shell - 2
- name: create directories - name: Ensure directories exist
ansible.builtin.file: ansible.builtin.file:
path: "{{ item }}" path: "{{ item }}"
state: directory state: directory
@ -15,11 +15,10 @@
group: root group: root
mode: "0755" mode: "0755"
loop: loop:
- /etc/munin
- /etc/munin/plugin-conf.d - /etc/munin/plugin-conf.d
- /etc/munin/plugins - /etc/munin/plugins
- name: Copy munin-node configuration. - name: Template munin-node configuration
ansible.builtin.template: ansible.builtin.template:
src: munin-node.conf.j2 src: munin-node.conf.j2
dest: /etc/munin/munin-node.conf dest: /etc/munin/munin-node.conf

View file

@ -1,11 +1,14 @@
--- ---
- name: include install-tasks - name: include install-tasks
ansible.builtin.include_tasks: install.yml ansible.builtin.include_tasks: install.yml
- name: include user tasks - name: include user tasks
ansible.builtin.include_tasks: user.yml ansible.builtin.include_tasks: user.yml
- name: include plugin-tasks - name: include plugin-tasks
ansible.builtin.include_tasks: additional.yml ansible.builtin.include_tasks: additional.yml
when: munin_node_plugins is defined when: munin_node_plugins is defined
- name: include remove-tasks - name: include remove-tasks
ansible.builtin.include_tasks: remove.yml ansible.builtin.include_tasks: remove.yml
when: munin_node_disabled_plugins is defined when: munin_node_disabled_plugins is defined

View file

@ -1,5 +1,5 @@
--- ---
- name: remove unwanted plugins - name: Ensure unwanted plugins are absent
ansible.builtin.file: ansible.builtin.file:
path: "{{ munin_plugin_dest_path }}{{ item }}" path: "{{ munin_plugin_dest_path }}{{ item }}"
state: absent state: absent
@ -7,7 +7,7 @@
notify: restart munin-node notify: restart munin-node
when: munin_node_disabled_plugins is defined when: munin_node_disabled_plugins is defined
- name: remove additional plugin-config - name: Ensure additional plugin-config is absent
ansible.builtin.file: ansible.builtin.file:
state: absent state: absent
dest: "{{ munin_plugin_conf_dest_path }}{{ item }}" dest: "{{ munin_plugin_conf_dest_path }}{{ item }}"

View file

@ -1,11 +1,11 @@
--- ---
- name: ensure group exists - name: Ensure group exists
become: true become: true
ansible.builtin.group: ansible.builtin.group:
name: "{{ munin_user_group }}" name: "{{ munin_user_group }}"
state: present state: present
- name: ensure user exists - name: Ensure user exists
become: true become: true
ansible.builtin.user: ansible.builtin.user:
name: munin name: munin
@ -13,7 +13,7 @@
shell: /usr/sbin/nologin shell: /usr/sbin/nologin
create_home: false create_home: false
- name: add user to sudoers - name: Ensure user is added to sudoers
become: true become: true
ansible.builtin.blockinfile: ansible.builtin.blockinfile:
path: /etc/sudoers path: /etc/sudoers

View file

@ -5,5 +5,8 @@ dotfiles:
- user: root - user: root
home: /root home: /root
dotfiles_vim_vundle_repo_url: https://git.mgrote.net/mirrors/Vundle.vim.git ansible_forgejo_user: svc_ansible
ansible_forgejo_user_pass: "{{ lookup('viczem.keepass.keepass', 'user_setup_forgejo_user_pass', 'password') }}" # user ist dem Repo als "Collaborator" + "RO" hinzugefügt worden
dotfiles_vim_vundle_repo_url: "https://{{ ansible_forgejo_user | urlencode }}:{{ ansible_forgejo_user_pass | urlencode }}@git.mgrote.net/mirrors/Vundle.vim.git"
dotfiles_repo_url: https://git.mgrote.net/mg/dotfiles dotfiles_repo_url: https://git.mgrote.net/mg/dotfiles