395 lines
15 KiB
Plaintext
395 lines
15 KiB
Plaintext
[1mdiff --git a/group_vars/all/main.yml b/group_vars/all/main.yml[m
|
||
[1mindex 7b325e6..603929a 100644[m
|
||
[1m--- a/group_vars/all/main.yml[m
|
||
[1m+++ b/group_vars/all/main.yml[m
|
||
[36m@@ -554,10 +554,18 @@[m [mapt_initial_install_bionic:[m
|
||
- ifupdown[m
|
||
- socat[m
|
||
[m
|
||
[31m-microcode_package: [m
|
||
[32m+[m[32mmicrocode_intel_package:[m[41m [m
|
||
- intel-microcode[m
|
||
[32m+[m
|
||
[32m+[m[32mmicrocode_amd_package:[m[41m [m
|
||
- amd64-microcode[m
|
||
[m
|
||
[32m+[m[32mfirmware_packages:[m
|
||
[32m+[m[32m - firmware-linux[m
|
||
[32m+[m
|
||
[32m+[m[32mfirmware_non_free_packages:[m
|
||
[32m+[m[32m - firmware-linux-nonfree[m
|
||
[32m+[m
|
||
apt_install_state: latest[m
|
||
[m
|
||
apt_remove:[m
|
||
[36m@@ -727,6 +735,167 @@[m [mapt_install_client_samba:[m
|
||
samba_server: file-akb.akb.netz[m
|
||
[m
|
||
[m
|
||
[32m+[m[32m# ==========[m
|
||
[32m+[m[32m# vars used by roles/common/tasks/pure-ftpd-install.yml[m
|
||
[32m+[m[32m# ==========[m
|
||
[32m+[m
|
||
[32m+[m[32mpureftpd_global_config_file: /etc/default/pure-ftpd-common[m
|
||
[32m+[m
|
||
[32m+[m[32mpureftpd_config_dir: /etc/pure-ftpd[m
|
||
[32m+[m[32mpureftpd_config_conf_dir: "{{ pureftpd_config_dir }}/conf"[m
|
||
[32m+[m[32mpureftpd_config_auth_dir: "{{ pureftpd_config_dir }}/auth"[m
|
||
[32m+[m[32mpureftpd_config_db_dir: "{{ pureftpd_config_dir }}/db"[m
|
||
[32m+[m
|
||
[32m+[m[32mpureftpd_config_fortune_file: "{{ pureftpd_config_dir }}/pureftpd-fortune.txt"[m
|
||
[32m+[m
|
||
[32m+[m[32mpureftpd_tls_certificate_pem: /etc/ssl/private/pure-ftpd.pem[m
|
||
[32m+[m
|
||
[32m+[m[32mpureftpd_packages:[m
|
||
[32m+[m[32m - pure-ftpd-common[m
|
||
[32m+[m[32m - pure-ftpd[m
|
||
[32m+[m
|
||
[32m+[m[32m# pure-ftpd-common.j2[m
|
||
[32m+[m[32mpureftpd_global_config_mode: standalone[m
|
||
[32m+[m[32mpureftpd_global_config_virtualchroot: false[m
|
||
[32m+[m[32mpureftpd_global_config_uploadscript: ''[m[41m [m
|
||
[32m+[m[32mpureftpd_global_config_uploaduid: ''[m
|
||
[32m+[m[32mpureftpd_global_config_uploadgid: ''[m
|
||
[32m+[m
|
||
[32m+[m[32mpureftpd_config:[m
|
||
[32m+[m[32m AltLog: 'clf:/var/log/pure-ftpd/transfer.log'[m
|
||
[32m+[m[32m AnonymousCantUpload: 'yes'[m
|
||
[32m+[m[32m Bind: ',21'[m
|
||
[32m+[m[32m CustomerProof: 'yes'[m
|
||
[32m+[m[32m DisplayDotFiles: 'yes'[m
|
||
[32m+[m[32m DontResolve: 'yes'[m
|
||
[32m+[m[32m FSCharset: 'UTF-8'[m
|
||
[32m+[m[32m ForcePassiveIP: ''[m
|
||
[32m+[m[32m MaxDiskUsage: '80'[m
|
||
[32m+[m[32m MinUID: '1000'[m
|
||
[32m+[m[32m NoAnonymous: 'yes'[m
|
||
[32m+[m[32m PAMAuthentication: 'no'[m
|
||
[32m+[m[32m PassivePortRange: '50000 50400'[m
|
||
[32m+[m[32m ProhibitDotFilesRead: 'no'[m
|
||
[32m+[m[32m ProhibitDotFilesWrite: 'yes'[m
|
||
[32m+[m[32m PureDB: '/etc/pure-ftpd/pureftpd.pdb'[m
|
||
[32m+[m[32m SyslogFacility: 'ftp'[m
|
||
[32m+[m[32m TLS: '1'[m
|
||
[32m+[m[32m TLSCipherSuite: 'HIGH'[m
|
||
[32m+[m[32m UnixAuthentication: 'no'[m
|
||
[32m+[m[32m #[m[41m [m
|
||
[32m+[m[32m # Available properties[m
|
||
[32m+[m[32m #[m
|
||
[32m+[m[32m # Available properties[m
|
||
[32m+[m[32m # AllowAnonymousFXP: 'no'[m
|
||
[32m+[m[32m # AllowUserFXP: 'no'[m
|
||
[32m+[m[32m # AltLog: 'clf:/var/log/pure-ftpd/transfer.log'[m
|
||
[32m+[m[32m # AnonymousBandwidth: '8'[m
|
||
[32m+[m[32m # AnonymousCanCreateDirs: 'no'[m
|
||
[32m+[m[32m # AnonymousCantUpload: 'yes'[m
|
||
[32m+[m[32m # AnonymousOnly: 'no'[m
|
||
[32m+[m[32m # AnonymousRatio: '1 10'[m
|
||
[32m+[m[32m # AntiWarez: 'yes'[m
|
||
[32m+[m[32m # AutoRename: 'no'[m
|
||
[32m+[m[32m # Bind: '127.0.0.1,21'[m
|
||
[32m+[m[32m # BrokenClientsCompatibility: 'no'[m
|
||
[32m+[m[32m # CallUploadScript: 'yes'[m
|
||
[32m+[m[32m # ChrootEveryone: 'yes'[m
|
||
[32m+[m[32m # ClientCharset: 'UTF-8'[m
|
||
[32m+[m[32m # CreateHomeDir: 'yes'[m
|
||
[32m+[m[32m # CustomerProof: 'yes'[m
|
||
[32m+[m[32m # Daemonize: 'yes'[m
|
||
[32m+[m[32m # DisplayDotFiles: 'yes'[m
|
||
[32m+[m[32m # DontResolve: 'yes'[m
|
||
[32m+[m[32m # ExtAuth: /var/run/ftpd.sock[m
|
||
[32m+[m[32m # ForcePassiveIP: '192.168.0.1'[m
|
||
[32m+[m[32m # FortunesFile: '/etc/pure-ftpd/cookie'[m
|
||
[32m+[m[32m # FSCharset: 'utf8'[m
|
||
[32m+[m[32m # IPV4Only: 'yes'[m
|
||
[32m+[m[32m # IPV6Only: 'yes'[m
|
||
[32m+[m[32m # KeepAllFiles: 'yes'[m
|
||
[32m+[m[32m # LDAPConfigFile: /etc/pureftpd-ldap.conf[m
|
||
[32m+[m[32m # LimitRecursion: '10000 8'[m
|
||
[32m+[m[32m # LogPID: 'yes'[m
|
||
[32m+[m[32m # MaxClientsNumber: '10'[m
|
||
[32m+[m[32m # MaxClientsPerIP: "{{ ansible_processor_cores }}"[m
|
||
[32m+[m[32m # MaxDiskUsage: '80'[m
|
||
[32m+[m[32m # MaxIdleTime: '15'[m
|
||
[32m+[m[32m # MaxLoad: '4'[m
|
||
[32m+[m[32m # MinUID: '1000'[m
|
||
[32m+[m[32m # MySQLConfigFile: /etc/pure-ftpd/mysql.conf[m
|
||
[32m+[m[32m # NoAnonymous: 'yes'[m
|
||
[32m+[m[32m # NoChmod: 'yes'[m
|
||
[32m+[m[32m # NoRename: 'yes'[m
|
||
[32m+[m[32m # NoTruncate: 'yes'[m
|
||
[32m+[m[32m # PAMAuthentication: 'no'[m
|
||
[32m+[m[32m # PassivePortRange: '30000 50000'[m
|
||
[32m+[m[32m # PerUserLimits: '3 20'[m
|
||
[32m+[m[32m # PGSQLConfigFile: /etc/pureftpd-pgsql.conf[m
|
||
[32m+[m[32m # PIDFile: '/var/run/pure-ftpd.pid'[m
|
||
[32m+[m[32m # ProhibitDotFilesRead: 'yes'[m
|
||
[32m+[m[32m # ProhibitDotFilesWrite: 'yes'[m
|
||
[32m+[m[32m # PureDB: /etc/pure-ftpd/pureftpd.pdb[m
|
||
[32m+[m[32m # Quota: '1000 10'[m
|
||
[32m+[m[32m # SyslogFacility: 'ftp'[m
|
||
[32m+[m[32m # TLS: '0'[m
|
||
[32m+[m[32m # TLSCipherSuite: 'ALL:!aNULL:!SSLv3'[m
|
||
[32m+[m[32m # TrustedIP: '10.1.1.1'[m
|
||
[32m+[m[32m # Umask: '113 002'[m
|
||
[32m+[m[32m # UnixAuthentication: 'no'[m
|
||
[32m+[m[32m # UserBandwidth: '8'[m
|
||
[32m+[m[32m # UserRatio: '1 10'[m
|
||
[32m+[m[32m # VerboseLog: 'no'[m
|
||
[32m+[m
|
||
[32m+[m[32mpureftpd_auth_puredb: 50[m
|
||
[32m+[m[32mpureftpd_auth_mysql: 0[m
|
||
[32m+[m[32mpureftpd_auth_postgresql: 0[m
|
||
[32m+[m[32mpureftpd_auth_ldap: 0[m
|
||
[32m+[m[32mpureftpd_auth_unix: 65[m
|
||
[32m+[m[32mpureftpd_auth_pam: 70[m
|
||
[32m+[m
|
||
[32m+[m[32m# Default FTP user/group[m
|
||
[32m+[m[32mpureftpd_virtual_users_group: nobody[m
|
||
[32m+[m[32mpureftpd_virtual_users_user: nogroup[m
|
||
[32m+[m[32m# pureftpd_virtual_users_gid: '65534'[m
|
||
[32m+[m[32m# pureftpd_virtual_users_uid: '65534'[m
|
||
[32m+[m
|
||
[32m+[m[32mpureftpd_virtual_users:[m
|
||
[32m+[m[32m - name: maica_scan[m
|
||
[32m+[m[32m password: maica_scan[m
|
||
[32m+[m[32m homedir: /data/samba/Scans/Maica_scans[m
|
||
[32m+[m[32m uid: maica[m
|
||
[32m+[m[32m gid: users[m
|
||
[32m+[m[32m - name: buero_scan[m
|
||
[32m+[m[32m password: buero_scan[m
|
||
[32m+[m[32m homedir: /data/samba/Scans/Buero_Scans[m
|
||
[32m+[m[32m uid: buero[m
|
||
[32m+[m[32m gid: users[m
|
||
[32m+[m[32m - name: jibran_scan[m
|
||
[32m+[m[32m password: jibran_scan[m
|
||
[32m+[m[32m homedir: /data/samba/Scans/Jibran_scan_Scans[m
|
||
[32m+[m[32m uid: jibran[m
|
||
[32m+[m[32m gid: users[m
|
||
[32m+[m[32m # Available properties[m
|
||
[32m+[m[32m # - name: vuser1[m
|
||
[32m+[m[32m # password: p4ssW0rd[m
|
||
[32m+[m[32m # homedir: /var/ftp/vuser1[m
|
||
[32m+[m[32m # uid: 2000[m
|
||
[32m+[m[32m # gid: 2000[m
|
||
[32m+[m[32m # quota_files: 2000[m
|
||
[32m+[m[32m # quota_size: 500[m
|
||
[32m+[m[32m # bandwidth_ul: 5[m
|
||
[32m+[m[32m # bandwidth_dl: 5[m
|
||
[32m+[m[32m # ratio_ul: 10[m
|
||
[32m+[m[32m # ratio_dl: 1[m
|
||
[32m+[m
|
||
[32m+[m[32mpureftpd_virtual_deleted_users: [][m
|
||
[32m+[m[32m # Available properties[m
|
||
[32m+[m[32m # - name: vuser2[m
|
||
[32m+[m
|
||
[32m+[m[32mpureftpd_virtual_users_import: false[m
|
||
[32m+[m
|
||
[32m+[m
|
||
[32m+[m
|
||
# ==========[m
|
||
# vars used by roles/common/tasks/user.yml[m
|
||
# ==========[m
|
||
[1mdiff --git a/hosts b/hosts[m
|
||
[1mindex 98add24..e3079cd 100644[m
|
||
[1m--- a/hosts[m
|
||
[1m+++ b/hosts[m
|
||
[36m@@ -53,4 +53,8 @@[m [mfile-akb.akb.netz ansible_user=root[m
|
||
file-akb.akb.netz ansible_user=root[m
|
||
192.168.82.20 ansible_user=root[m
|
||
[m
|
||
[32m+[m[32m[ftp_server][m
|
||
[32m+[m[32mfile-akb.akb.netz ansible_user=root[m
|
||
[32m+[m[32m192.168.82.20 ansible_user=root[m
|
||
[32m+[m
|
||
[gateway_server][m
|
||
[1mdiff --git a/roles/common/handlers/main.yml b/roles/common/handlers/main.yml[m
|
||
[1mindex f9391f6..be73450 100644[m
|
||
[1m--- a/roles/common/handlers/main.yml[m
|
||
[1m+++ b/roles/common/handlers/main.yml[m
|
||
[36m@@ -59,3 +59,12 @@[m
|
||
name: cups-browsed[m
|
||
daemon_reload: yes[m
|
||
state: restarted[m
|
||
[32m+[m
|
||
[32m+[m[32m- name: reload Pure-FTPd users[m
|
||
[32m+[m[32m command: pure-pw mkdb[m
|
||
[32m+[m
|
||
[32m+[m[32m- name: restart Pure-FTPd[m
|
||
[32m+[m[32m service:[m
|
||
[32m+[m[32m name: pure-ftpd[m
|
||
[32m+[m[32m state: restarted[m
|
||
[41m+[m
|
||
[1mdiff --git a/roles/common/tasks/apt.yml b/roles/common/tasks/apt.yml[m
|
||
[1mindex 466edd1..77fd1c4 100644[m
|
||
[1m--- a/roles/common/tasks/apt.yml[m
|
||
[1m+++ b/roles/common/tasks/apt.yml[m
|
||
[36m@@ -96,12 +96,17 @@[m
|
||
tags:[m
|
||
- apt-initial-install[m
|
||
[m
|
||
[31m-- name: (apt.yml) Ensure we have CPU microcode from backports (debian stretch)[m
|
||
[32m+[m[32m# ---[m
|
||
[32m+[m[32m# Microcode[m
|
||
[32m+[m[32m# ---[m
|
||
[32m+[m
|
||
[32m+[m[32m- name: (apt.yml) Ensure we have CPU microcode from backports for Intel CPU (debian stretch)[m
|
||
apt:[m
|
||
[31m- name: "{{ microcode_package }}"[m
|
||
[32m+[m[32m name: "{{ microcode_intel_package }}"[m
|
||
state: present[m
|
||
default_release: "{{ ansible_distribution_release }}-backports"[m
|
||
when:[m
|
||
[32m+[m[32m - apt_backports_enable[m
|
||
- ansible_facts['distribution'] == "Debian"[m
|
||
- ansible_facts['distribution_major_version'] == "9"[m
|
||
- ansible_facts['processor']|string is search("Intel")[m
|
||
[36m@@ -109,9 +114,24 @@[m
|
||
- apt-initial-install[m
|
||
- apt-microcode[m
|
||
[m
|
||
[31m-- name: (apt.yml) Install CPU microcode (debian buster)[m
|
||
[32m+[m[32m- name: (apt.yml) Ensure we have CPU microcode from backports for AMD CPU (debian stretch)[m
|
||
[32m+[m[32m apt:[m
|
||
[32m+[m[32m name: "{{ microcode_amd_package }}"[m
|
||
[32m+[m[32m state: present[m
|
||
[32m+[m[32m default_release: "{{ ansible_distribution_release }}-backports"[m
|
||
[32m+[m[32m when:[m
|
||
[32m+[m[32m - apt_backports_enable[m
|
||
[32m+[m[32m - apt_debian_contrib_nonfree_enable[m
|
||
[32m+[m[32m - ansible_facts['distribution'] == "Debian"[m
|
||
[32m+[m[32m - ansible_facts['distribution_major_version'] == "9"[m
|
||
[32m+[m[32m - ansible_facts['processor']|string is search("AMD")[m
|
||
[32m+[m[32m tags:[m
|
||
[32m+[m[32m - apt-initial-install[m
|
||
[32m+[m[32m - apt-microcode[m
|
||
[32m+[m
|
||
[32m+[m[32m- name: (apt.yml) Install CPU microcode for Intel CPU (debian buster)[m
|
||
apt:[m
|
||
[31m- name: "{{ microcode_package }}"[m
|
||
[32m+[m[32m name: "{{ microcode_intel_package }}"[m
|
||
state: present[m
|
||
default_release: "{{ ansible_distribution_release }}"[m
|
||
when:[m
|
||
[36m@@ -122,9 +142,23 @@[m
|
||
- apt-initial-install[m
|
||
- apt-microcode[m
|
||
[m
|
||
[31m-- name: (apt.yml) Install CPU microcode (ubuntu bionic)[m
|
||
[32m+[m[32m- name: (apt.yml) Install CPU microcode for AMD CPU (debian buster)[m
|
||
apt:[m
|
||
[31m- name: "{{ microcode_package }}"[m
|
||
[32m+[m[32m name: "{{ microcode_amd_package }}"[m
|
||
[32m+[m[32m state: present[m
|
||
[32m+[m[32m default_release: "{{ ansible_distribution_release }}"[m
|
||
[32m+[m[32m when:[m
|
||
[32m+[m[32m - apt_debian_contrib_nonfree_enable[m
|
||
[32m+[m[32m - ansible_facts['distribution'] == "Debian"[m
|
||
[32m+[m[32m - ansible_facts['distribution_major_version'] == "10"[m
|
||
[32m+[m[32m - ansible_facts['processor']|string is search("AMD")[m
|
||
[32m+[m[32m tags:[m
|
||
[32m+[m[32m - apt-initial-install[m
|
||
[32m+[m[32m - apt-microcode[m
|
||
[32m+[m
|
||
[32m+[m[32m- name: (apt.yml) Install CPU microcode for Intel CPU (ubuntu bionic)[m
|
||
[32m+[m[32m apt:[m
|
||
[32m+[m[32m name: "{{ microcode_intel_package }}"[m
|
||
state: present[m
|
||
default_release: "{{ ansible_distribution_release }}"[m
|
||
when:[m
|
||
[36m@@ -135,9 +169,23 @@[m
|
||
- apt-initial-install[m
|
||
- apt-microcode[m
|
||
[m
|
||
[31m-- name: (apt.yml) Install CPU microcode (ubuntu xenial)[m
|
||
[32m+[m[32m- name: (apt.yml) Install CPU microcode for AMD CPU (ubuntu bionic)[m
|
||
apt:[m
|
||
[31m- name: "{{ microcode_package }}"[m
|
||
[32m+[m[32m name: "{{ microcode_amd_package }}"[m
|
||
[32m+[m[32m state: present[m
|
||
[32m+[m[32m default_release: "{{ ansible_distribution_release }}"[m
|
||
[32m+[m[32m when:[m
|
||
[32m+[m[32m - apt_debian_contrib_nonfree_enable[m
|
||
[32m+[m[32m - ansible_facts['distribution'] == "Ubuntu"[m
|
||
[32m+[m[32m - ansible_facts['distribution_release'] == "bionic"[m
|
||
[32m+[m[32m - ansible_facts['processor']|string is search("AMD")[m
|
||
[32m+[m[32m tags:[m
|
||
[32m+[m[32m - apt-initial-install[m
|
||
[32m+[m[32m - apt-microcode[m
|
||
[32m+[m
|
||
[32m+[m[32m- name: (apt.yml) Install CPU microcode for Intel CPU (ubuntu xenial)[m
|
||
[32m+[m[32m apt:[m
|
||
[32m+[m[32m name: "{{ microcode_intel_package }}"[m
|
||
state: present[m
|
||
default_release: "{{ ansible_distribution_release }}"[m
|
||
when:[m
|
||
[36m@@ -148,6 +196,49 @@[m
|
||
- apt-initial-install[m
|
||
- apt-microcode[m
|
||
[m
|
||
[32m+[m[32m- name: (apt.yml) Install CPU microcode for Intel AMD (ubuntu xenial)[m
|
||
[32m+[m[32m apt:[m
|
||
[32m+[m[32m name: "{{ microcode_amd_package }}"[m
|
||
[32m+[m[32m state: present[m
|
||
[32m+[m[32m default_release: "{{ ansible_distribution_release }}"[m
|
||
[32m+[m[32m when:[m
|
||
[32m+[m[32m - apt_debian_contrib_nonfree_enable[m
|
||
[32m+[m[32m - ansible_facts['distribution'] == "Ubuntu"[m
|
||
[32m+[m[32m - ansible_facts['distribution_release'] == "xenial"[m
|
||
[32m+[m[32m - ansible_facts['processor']|string is search("AMD")[m
|
||
[32m+[m[32m tags:[m
|
||
[32m+[m[32m - apt-initial-install[m
|
||
[32m+[m[32m - apt-microcode[m
|
||
[32m+[m
|
||
[32m+[m[32m# ---[m
|
||
[32m+[m[32m# Firmware[m
|
||
[32m+[m[32m# ---[m
|
||
[32m+[m
|
||
[32m+[m[32m- name: (apt.yml) Install Firmware packages[m
|
||
[32m+[m[32m apt:[m
|
||
[32m+[m[32m name: "{{ firmware_non_free_packages }}"[m
|
||
[32m+[m[32m state: present[m
|
||
[32m+[m[32m default_release: "{{ ansible_distribution_release }}"[m
|
||
[32m+[m[32m tags:[m
|
||
[32m+[m[32m - apt-initial-install[m
|
||
[32m+[m[32m - apt-firmware[m
|
||
[32m+[m
|
||
[32m+[m[32m- name: (apt.yml) Install non-free Firmware packages[m
|
||
[32m+[m[32m apt:[m
|
||
[32m+[m[32m name: "{{ firmware_non_free_packages }}"[m
|
||
[32m+[m[32m state: present[m
|
||
[32m+[m[32m default_release: "{{ ansible_distribution_release }}"[m
|
||
[32m+[m[32m when:[m
|
||
[32m+[m[32m - apt_debian_contrib_nonfree_enable[m
|
||
[32m+[m[32m tags:[m
|
||
[32m+[m[32m - apt-initial-install[m
|
||
[32m+[m[32m - apt-firmware[m
|
||
[32m+[m
|
||
[32m+[m
|
||
[32m+[m[32m# ---[m
|
||
[32m+[m[32m# unwanted packages[m
|
||
[32m+[m[32m# ---[m
|
||
[32m+[m
|
||
- name: (apt.yml) Remove unwanted packages[m
|
||
apt:[m
|
||
name: "{{ apt_remove }}"[m
|
||
[1mdiff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml[m
|
||
[1mindex cba68be..b9802b6 100644[m
|
||
[1m--- a/roles/common/tasks/main.yml[m
|
||
[1m+++ b/roles/common/tasks/main.yml[m
|
||
[36m@@ -55,6 +55,14 @@[m
|
||
tags:[m
|
||
- cups[m
|
||
[m
|
||
[32m+[m[32m# tags supported inside cups-install.yml:[m
|
||
[32m+[m[32m#[m
|
||
[32m+[m[32m- import_tasks: pure-ftpd-install.yml[m
|
||
[32m+[m[32m when:[m[41m [m
|
||
[32m+[m[32m - groups['ftp_server']|string is search(inventory_hostname)[m
|
||
[32m+[m[32m tags:[m
|
||
[32m+[m[32m - pure-ftpd[m
|
||
[32m+[m
|
||
# tags supported inside nfs.yml:[m
|
||
#[m
|
||
# nfs-server[m
|