diff --git a/docker-compose/httpd/httpd.conf.j2 b/docker-compose/httpd/httpd.conf.j2 deleted file mode 100644 index 11eb767b..00000000 --- a/docker-compose/httpd/httpd.conf.j2 +++ /dev/null @@ -1,555 +0,0 @@ -# -# This is the main Apache HTTP server configuration file. It contains the -# configuration directives that give the server its instructions. -# See for detailed information. -# In particular, see -# -# for a discussion of each configuration directive. -# -# Do NOT simply read the instructions in here without understanding -# what they do. They're here only as hints or reminders. If you are unsure -# consult the online docs. You have been warned. -# -# Configuration and logfile names: If the filenames you specify for many -# of the server's control files begin with "/" (or "drive:/" for Win32), the -# server will use that explicit path. If the filenames do *not* begin -# with "/", the value of ServerRoot is prepended -- so "logs/access_log" -# with ServerRoot set to "/usr/local/apache2" will be interpreted by the -# server as "/usr/local/apache2/logs/access_log", whereas "/logs/access_log" -# will be interpreted as '/logs/access_log'. - -# -# ServerRoot: The top of the directory tree under which the server's -# configuration, error, and log files are kept. -# -# Do not add a slash at the end of the directory path. If you point -# ServerRoot at a non-local disk, be sure to specify a local disk on the -# Mutex directive, if file-based mutexes are used. If you wish to share the -# same ServerRoot for multiple httpd daemons, you will need to change at -# least PidFile. -# -ServerRoot "/usr/local/apache2" - -# -# Mutex: Allows you to set the mutex mechanism and mutex file directory -# for individual mutexes, or change the global defaults -# -# Uncomment and change the directory if mutexes are file-based and the default -# mutex file directory is not on a local disk or is not appropriate for some -# other reason. -# -# Mutex default:logs - -# -# Listen: Allows you to bind Apache to specific IP addresses and/or -# ports, instead of the default. See also the -# directive. -# -# Change this to Listen on specific IP addresses as shown below to -# prevent Apache from glomming onto all bound IP addresses. -# -#Listen 12.34.56.78:80 -Listen 80 - -# -# Dynamic Shared Object (DSO) Support -# -# To be able to use the functionality of a module which was built as a DSO you -# have to place corresponding `LoadModule' lines at this location so the -# directives contained in it are actually available _before_ they are used. -# Statically compiled modules (those listed by `httpd -l') do not need -# to be loaded here. -# -# Example: -# LoadModule foo_module modules/mod_foo.so -# -LoadModule mpm_event_module modules/mod_mpm_event.so -#LoadModule mpm_prefork_module modules/mod_mpm_prefork.so -#LoadModule mpm_worker_module modules/mod_mpm_worker.so -LoadModule authn_file_module modules/mod_authn_file.so -#LoadModule authn_dbm_module modules/mod_authn_dbm.so -#LoadModule authn_anon_module modules/mod_authn_anon.so -#LoadModule authn_dbd_module modules/mod_authn_dbd.so -#LoadModule authn_socache_module modules/mod_authn_socache.so -LoadModule authn_core_module modules/mod_authn_core.so -LoadModule authz_host_module modules/mod_authz_host.so -LoadModule authz_groupfile_module modules/mod_authz_groupfile.so -LoadModule authz_user_module modules/mod_authz_user.so -#LoadModule authz_dbm_module modules/mod_authz_dbm.so -#LoadModule authz_owner_module modules/mod_authz_owner.so -#LoadModule authz_dbd_module modules/mod_authz_dbd.so -LoadModule authz_core_module modules/mod_authz_core.so -#LoadModule authnz_ldap_module modules/mod_authnz_ldap.so -#LoadModule authnz_fcgi_module modules/mod_authnz_fcgi.so -LoadModule access_compat_module modules/mod_access_compat.so -LoadModule auth_basic_module modules/mod_auth_basic.so -#LoadModule auth_form_module modules/mod_auth_form.so -#LoadModule auth_digest_module modules/mod_auth_digest.so -#LoadModule allowmethods_module modules/mod_allowmethods.so -#LoadModule isapi_module modules/mod_isapi.so -#LoadModule file_cache_module modules/mod_file_cache.so -#LoadModule cache_module modules/mod_cache.so -#LoadModule cache_disk_module modules/mod_cache_disk.so -#LoadModule cache_socache_module modules/mod_cache_socache.so -#LoadModule socache_shmcb_module modules/mod_socache_shmcb.so -#LoadModule socache_dbm_module modules/mod_socache_dbm.so -#LoadModule socache_memcache_module modules/mod_socache_memcache.so -#LoadModule socache_redis_module modules/mod_socache_redis.so -#LoadModule watchdog_module modules/mod_watchdog.so -#LoadModule macro_module modules/mod_macro.so -#LoadModule dbd_module modules/mod_dbd.so -#LoadModule bucketeer_module modules/mod_bucketeer.so -#LoadModule dumpio_module modules/mod_dumpio.so -#LoadModule echo_module modules/mod_echo.so -#LoadModule example_hooks_module modules/mod_example_hooks.so -#LoadModule case_filter_module modules/mod_case_filter.so -#LoadModule case_filter_in_module modules/mod_case_filter_in.so -#LoadModule example_ipc_module modules/mod_example_ipc.so -#LoadModule buffer_module modules/mod_buffer.so -#LoadModule data_module modules/mod_data.so -#LoadModule ratelimit_module modules/mod_ratelimit.so -LoadModule reqtimeout_module modules/mod_reqtimeout.so -#LoadModule ext_filter_module modules/mod_ext_filter.so -#LoadModule request_module modules/mod_request.so -#LoadModule include_module modules/mod_include.so -LoadModule filter_module modules/mod_filter.so -#LoadModule reflector_module modules/mod_reflector.so -#LoadModule substitute_module modules/mod_substitute.so -#LoadModule sed_module modules/mod_sed.so -#LoadModule charset_lite_module modules/mod_charset_lite.so -#LoadModule deflate_module modules/mod_deflate.so -#LoadModule xml2enc_module modules/mod_xml2enc.so -#LoadModule proxy_html_module modules/mod_proxy_html.so -#LoadModule brotli_module modules/mod_brotli.so -LoadModule mime_module modules/mod_mime.so -#LoadModule ldap_module modules/mod_ldap.so -LoadModule log_config_module modules/mod_log_config.so -#LoadModule log_debug_module modules/mod_log_debug.so -#LoadModule log_forensic_module modules/mod_log_forensic.so -#LoadModule logio_module modules/mod_logio.so -#LoadModule lua_module modules/mod_lua.so -LoadModule env_module modules/mod_env.so -#LoadModule mime_magic_module modules/mod_mime_magic.so -#LoadModule cern_meta_module modules/mod_cern_meta.so -#LoadModule expires_module modules/mod_expires.so -LoadModule headers_module modules/mod_headers.so -#LoadModule ident_module modules/mod_ident.so -#LoadModule usertrack_module modules/mod_usertrack.so -#LoadModule unique_id_module modules/mod_unique_id.so -LoadModule setenvif_module modules/mod_setenvif.so -LoadModule version_module modules/mod_version.so -#LoadModule remoteip_module modules/mod_remoteip.so -#LoadModule proxy_module modules/mod_proxy.so -#LoadModule proxy_connect_module modules/mod_proxy_connect.so -#LoadModule proxy_ftp_module modules/mod_proxy_ftp.so -#LoadModule proxy_http_module modules/mod_proxy_http.so -#LoadModule proxy_fcgi_module modules/mod_proxy_fcgi.so -#LoadModule proxy_scgi_module modules/mod_proxy_scgi.so -#LoadModule proxy_uwsgi_module modules/mod_proxy_uwsgi.so -#LoadModule proxy_fdpass_module modules/mod_proxy_fdpass.so -#LoadModule proxy_wstunnel_module modules/mod_proxy_wstunnel.so -#LoadModule proxy_ajp_module modules/mod_proxy_ajp.so -#LoadModule proxy_balancer_module modules/mod_proxy_balancer.so -#LoadModule proxy_express_module modules/mod_proxy_express.so -#LoadModule proxy_hcheck_module modules/mod_proxy_hcheck.so -#LoadModule session_module modules/mod_session.so -#LoadModule session_cookie_module modules/mod_session_cookie.so -#LoadModule session_crypto_module modules/mod_session_crypto.so -#LoadModule session_dbd_module modules/mod_session_dbd.so -#LoadModule slotmem_shm_module modules/mod_slotmem_shm.so -#LoadModule slotmem_plain_module modules/mod_slotmem_plain.so -#LoadModule ssl_module modules/mod_ssl.so -#LoadModule optional_hook_export_module modules/mod_optional_hook_export.so -#LoadModule optional_hook_import_module modules/mod_optional_hook_import.so -#LoadModule optional_fn_import_module modules/mod_optional_fn_import.so -#LoadModule optional_fn_export_module modules/mod_optional_fn_export.so -#LoadModule dialup_module modules/mod_dialup.so -#LoadModule http2_module modules/mod_http2.so -#LoadModule proxy_http2_module modules/mod_proxy_http2.so -#LoadModule md_module modules/mod_md.so -#LoadModule lbmethod_byrequests_module modules/mod_lbmethod_byrequests.so -#LoadModule lbmethod_bytraffic_module modules/mod_lbmethod_bytraffic.so -#LoadModule lbmethod_bybusyness_module modules/mod_lbmethod_bybusyness.so -#LoadModule lbmethod_heartbeat_module modules/mod_lbmethod_heartbeat.so -LoadModule unixd_module modules/mod_unixd.so -#LoadModule heartbeat_module modules/mod_heartbeat.so -#LoadModule heartmonitor_module modules/mod_heartmonitor.so -#LoadModule dav_module modules/mod_dav.so -LoadModule status_module modules/mod_status.so -LoadModule autoindex_module modules/mod_autoindex.so -#LoadModule asis_module modules/mod_asis.so -#LoadModule info_module modules/mod_info.so -#LoadModule suexec_module modules/mod_suexec.so - - #LoadModule cgid_module modules/mod_cgid.so - - - #LoadModule cgi_module modules/mod_cgi.so - -#LoadModule dav_fs_module modules/mod_dav_fs.so -#LoadModule dav_lock_module modules/mod_dav_lock.so -#LoadModule vhost_alias_module modules/mod_vhost_alias.so -#LoadModule negotiation_module modules/mod_negotiation.so -LoadModule dir_module modules/mod_dir.so -#LoadModule imagemap_module modules/mod_imagemap.so -#LoadModule actions_module modules/mod_actions.so -#LoadModule speling_module modules/mod_speling.so -#LoadModule userdir_module modules/mod_userdir.so -LoadModule alias_module modules/mod_alias.so -#LoadModule rewrite_module modules/mod_rewrite.so - - -# -# If you wish httpd to run as a different user or group, you must run -# httpd as root initially and it will switch. -# -# User/Group: The name (or #number) of the user/group to run httpd as. -# It is usually good practice to create a dedicated user and group for -# running httpd, as with most system services. -# -User www-data -Group www-data - - - -# 'Main' server configuration -# -# The directives in this section set up the values used by the 'main' -# server, which responds to any requests that aren't handled by a -# definition. These values also provide defaults for -# any containers you may define later in the file. -# -# All of these directives may appear inside containers, -# in which case these default settings will be overridden for the -# virtual host being defined. -# - -# -# ServerAdmin: Your address, where problems with the server should be -# e-mailed. This address appears on some server-generated pages, such -# as error documents. e.g. admin@your-domain.com -# -ServerAdmin you@example.com - -# -# ServerName gives the name and port that the server uses to identify itself. -# This can often be determined automatically, but we recommend you specify -# it explicitly to prevent problems during startup. -# -# If your host doesn't have a registered DNS name, enter its IP address here. -# -#ServerName www.example.com:80 - -# -# Deny access to the entirety of your server's filesystem. You must -# explicitly permit access to web content directories in other -# blocks below. -# - - AllowOverride none - Require all granted - - -# -# Note that from this point forward you must specifically allow -# particular features to be enabled - so if something's not working as -# you might expect, make sure that you have specifically enabled it -# below. -# - -# -# DocumentRoot: The directory out of which you will serve your -# documents. By default, all requests are taken from this directory, but -# symbolic links and aliases may be used to point to other locations. -# -DocumentRoot "/usr/local/apache2/htdocs" - - # - # Possible values for the Options directive are "None", "All", - # or any combination of: - # Indexes Includes FollowSymLinks SymLinksifOwnerMatch ExecCGI MultiViews - # - # Note that "MultiViews" must be named *explicitly* --- "Options All" - # doesn't give it to you. - # - # The Options directive is both complicated and important. Please see - # http://httpd.apache.org/docs/2.4/mod/core.html#options - # for more information. - # - Options Indexes FollowSymLinks - - # - # AllowOverride controls what directives may be placed in .htaccess files. - # It can be "All", "None", or any combination of the keywords: - # AllowOverride FileInfo AuthConfig Limit - # - AllowOverride None - - # - # Controls who can get stuff from this server. - # - - # Ab hier alles für schöne Dir-listings - # https://perishablepress.com/better-default-directory-views-with-htaccess/ - IndexOptions IgnoreCase FancyIndexing FoldersFirst NameWidth=* DescriptionWidth=* SuppressHTMLPreamble - Order allow,deny - Options +Indexes - Allow from all - -# -# DirectoryIndex: sets the file that Apache will serve if a directory -# is requested. -# - - DirectoryIndex index.html - - -# -# The following lines prevent .htaccess and .htpasswd files from being -# viewed by Web clients. -# - - Require all denied - - -# -# ErrorLog: The location of the error log file. -# If you do not specify an ErrorLog directive within a -# container, error messages relating to that virtual host will be -# logged here. If you *do* define an error logfile for a -# container, that host's errors will be logged there and not here. -# -ErrorLog /proc/self/fd/2 - -# -# LogLevel: Control the number of messages logged to the error_log. -# Possible values include: debug, info, notice, warn, error, crit, -# alert, emerg. -# -LogLevel warn - - - # - # The following directives define some format nicknames for use with - # a CustomLog directive (see below). - # - LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined - LogFormat "%h %l %u %t \"%r\" %>s %b" common - - - # You need to enable mod_logio.c to use %I and %O - LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %I %O" combinedio - - - # - # The location and format of the access logfile (Common Logfile Format). - # If you do not define any access logfiles within a - # container, they will be logged here. Contrariwise, if you *do* - # define per- access logfiles, transactions will be - # logged therein and *not* in this file. - # - CustomLog /proc/self/fd/1 common - - # - # If you prefer a logfile with access, agent, and referer information - # (Combined Logfile Format) you can use the following directive. - # - #CustomLog "logs/access_log" combined - - - - # - # Redirect: Allows you to tell clients about documents that used to - # exist in your server's namespace, but do not anymore. The client - # will make a new request for the document at its new location. - # Example: - # Redirect permanent /foo http://www.example.com/bar - - # - # Alias: Maps web paths into filesystem paths and is used to - # access content that does not live under the DocumentRoot. - # Example: - # Alias /webpath /full/filesystem/path - # - # If you include a trailing / on /webpath then the server will - # require it to be present in the URL. You will also likely - # need to provide a section to allow access to - # the filesystem path. - - # - # ScriptAlias: This controls which directories contain server scripts. - # ScriptAliases are essentially the same as Aliases, except that - # documents in the target directory are treated as applications and - # run by the server when requested rather than as documents sent to the - # client. The same rules about trailing "/" apply to ScriptAlias - # directives as to Alias. - # - ScriptAlias /cgi-bin/ "/usr/local/apache2/cgi-bin/" - - - - - # - # ScriptSock: On threaded servers, designate the path to the UNIX - # socket used to communicate with the CGI daemon of mod_cgid. - # - #Scriptsock cgisock - - -# -# "/usr/local/apache2/cgi-bin" should be changed to whatever your ScriptAliased -# CGI directory exists, if you have that configured. -# - - AllowOverride None - Options None - Require all granted - - - - # - # Avoid passing HTTP_PROXY environment to CGI's on this or any proxied - # backend servers which have lingering "httpoxy" defects. - # 'Proxy' request header is undefined by the IETF, not listed by IANA - # - RequestHeader unset Proxy early - - - - # - # TypesConfig points to the file containing the list of mappings from - # filename extension to MIME-type. - # - TypesConfig conf/mime.types - - # - # AddType allows you to add to or override the MIME configuration - # file specified in TypesConfig for specific file types. - # - #AddType application/x-gzip .tgz - # - # AddEncoding allows you to have certain browsers uncompress - # information on the fly. Note: Not all browsers support this. - # - #AddEncoding x-compress .Z - #AddEncoding x-gzip .gz .tgz - # - # If the AddEncoding directives above are commented-out, then you - # probably should define those extensions to indicate media types: - # - AddType application/x-compress .Z - AddType application/x-gzip .gz .tgz - - # - # AddHandler allows you to map certain file extensions to "handlers": - # actions unrelated to filetype. These can be either built into the server - # or added with the Action directive (see below) - # - # To use CGI scripts outside of ScriptAliased directories: - # (You will also need to add "ExecCGI" to the "Options" directive.) - # - #AddHandler cgi-script .cgi - - # For type maps (negotiated resources): - #AddHandler type-map var - - # - # Filters allow you to process content before it is sent to the client. - # - # To parse .shtml files for server-side includes (SSI): - # (You will also need to add "Includes" to the "Options" directive.) - # - #AddType text/html .shtml - #AddOutputFilter INCLUDES .shtml - - -# -# The mod_mime_magic module allows the server to use various hints from the -# contents of the file itself to determine its type. The MIMEMagicFile -# directive tells the module where the hint definitions are located. -# -#MIMEMagicFile conf/magic - -# -# Customizable error responses come in three flavors: -# 1) plain text 2) local redirects 3) external redirects -# -# Some examples: -#ErrorDocument 500 "The server made a boo boo." -#ErrorDocument 404 /missing.html -#ErrorDocument 404 "/cgi-bin/missing_handler.pl" -#ErrorDocument 402 http://www.example.com/subscription_info.html -# - -# -# MaxRanges: Maximum number of Ranges in a request before -# returning the entire resource, or one of the special -# values 'default', 'none' or 'unlimited'. -# Default setting is to accept 200 Ranges. -#MaxRanges unlimited - -# -# EnableMMAP and EnableSendfile: On systems that support it, -# memory-mapping or the sendfile syscall may be used to deliver -# files. This usually improves server performance, but must -# be turned off when serving from networked-mounted -# filesystems or if support for these functions is otherwise -# broken on your system. -# Defaults: EnableMMAP On, EnableSendfile Off -# -#EnableMMAP off -#EnableSendfile on - -# Supplemental configuration -# -# The configuration files in the conf/extra/ directory can be -# included to add extra features or to modify the default configuration of -# the server, or you may simply copy their contents here and change as -# necessary. - -# Server-pool management (MPM specific) -#Include conf/extra/httpd-mpm.conf - -# Multi-language error messages -#Include conf/extra/httpd-multilang-errordoc.conf - -# Fancy directory listings -Include conf/extra/httpd-autoindex.conf - -# Language settings -#Include conf/extra/httpd-languages.conf - -# User home directories -#Include conf/extra/httpd-userdir.conf - -# Real-time info on requests and configuration -#Include conf/extra/httpd-info.conf - -# Virtual hosts -#Include conf/extra/httpd-vhosts.conf - -# Local access to the Apache HTTP Server Manual -#Include conf/extra/httpd-manual.conf - -# Distributed authoring and versioning (WebDAV) -#Include conf/extra/httpd-dav.conf - -# Various default settings -#Include conf/extra/httpd-default.conf - -# Configure mod_proxy_html to understand HTML4/XHTML1 - -Include conf/extra/proxy-html.conf - - -# Secure (SSL/TLS) connections -#Include conf/extra/httpd-ssl.conf -# -# Note: The following must must be present to support -# starting without SSL on platforms with no /dev/random equivalent -# but a statically compiled-in mod_ssl. -# - -SSLRandomSeed startup builtin -SSLRandomSeed connect builtin - diff --git a/docker-compose/httpd/docker-compose.yml.j2 b/friedhof/httpd similarity index 100% rename from docker-compose/httpd/docker-compose.yml.j2 rename to friedhof/httpd diff --git a/friedhof/mgrote_zfs_sanoid_mit_syncoid/README.md b/friedhof/mgrote_zfs_sanoid_mit_syncoid/README.md new file mode 100644 index 00000000..552ed0f0 --- /dev/null +++ b/friedhof/mgrote_zfs_sanoid_mit_syncoid/README.md @@ -0,0 +1,85 @@ +## mgrote.zfs_sanoid + +### Beschreibung +Installiert und konfiguriert ``sanoid`` + ``syncoid``. + +Es gibt 3 Funktionen: + +1. Snapshots erstellen und entfernen +2. Snapshots senden +3. Snapshots empfangen + +### getestet auf +- ProxMox 7.* +- Ubuntu 20.04 + +### Variablen + Defaults +- see [defaults](./defaults/main.yml) + + +### Beispiel Playbook + +```yaml +--- +- hosts: host1,host2 + roles: + - { role: mgrote_zfs_sanoid, tags: "sanoid" } +``` + +### Beispiel - Snapshots erstellen + + +#### Variablen + +```yaml +--- + sanoid_snaps_enable: true + sanoid_datasets: + - path: 'hdd_data/videos' + template: '31tage' + recursive: 'yes' + snapshots: true + sanoid_templates: + - name: '31tage' + keep_hourly: '24' # Aufheben (Stunde) + keep_daily: '31' # Aufheben (Tage) + keep_monthly: '3' # Aufheben (Monate) + keep_yearly: '0' # Aufheben (Jahre) + frequently: '16' # Aufheben (Minuten) + frequent_period: '15' # Intervall (alle 5 Minuten) + autosnap: 'yes' # Automatisches erstellen von Snapshots + autoprune: 'yes' + +``` + +### Beispiel - Snapshots senden und empfangen + +- Host 1 = Source +- Host 2 = Destination + + + +#### Variablen - Host 1 + +```yaml + sanoid_syncoid_source_host: true + sanoid_syncoid_ssh_pubkey: | + ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC3U37DGPRPDLlgxZcM0Zj/x6RVZxs7hcWBYfPywujH4+mjbpzJckr2tx3QLfxsCCjQVb4LNSEB0xsOvzDjfDsaPuG4wzqFVyZOtjI4iWg/it4ARndun33r+xSlWc5JKHH9GRK8SBOd4lXv5ylENdhWQ7z5ZF/FtCysb1JHTTYlobgXfTZ4NswJj6BBk669l13uL6zSXq6x6vm1GWiFIcIYqwM5WGSGHFoD2RNn0TJKI9A3AULPloMzWeHG3fJhoVfNY6ZB0kqpTHGoAmJUURkBFki1cJkzx3tyto4VpTzZmUyYg+qqIWbv7Me3YVJCln8JYD10uDb2oPRx6G3C9DlnzRmAVVbqCHzwvOY0H5TLTW7AXCHHgSdHaRym4oTUY9dDS/XFU3rHgexerBbi3sy1Tm0/dEU3cZFm4YOJXY/l4TeTRlhg2VbctsWE1BN1CZcoJRR+qNdJzM7Vl70Y6RGU92Y1rzSpooYVuyCFDrEIp0hAHidb5rs4paCvoxtVqak+LK8dcq0IbWxcxomEimeRG4+Opd3vo+U6subp5jqkOY0uYkFVJXaMHkP5ZIxlCFgif2A3YAPhz9IczRJaaNY3pbVgU7ybOBp+S8KRK8Ysk6OP5ApOTQVTlRhYeNqo7mpuW6139VRY5luekSCy3ehHCI9/MObhu2juF1Nz0HMeMQ== mg@irantu +``` + + +#### Variablen - Host 2 + +```yaml + sanoid_syncoid_timer: '*:*' + sanoid_syncoid_bwlimit: 30m + sanoid_syncoid_datasets_sync: + - source_host: host1.lan + source_dataset: hdd_data_mirror + destination_mount_check: hdd_data/encrypted # Wenn dieses Dataset nicht gemountet ist(z.B. durch Verschlüsselung, dann bricht syncoid ab) + destination_dataset: hdd_data/encrypted/syncoid/zfs1 + skip_parent: false + sanoid_syncoid_ssh_privkey: "{{ lookup('viczem.keepass.keepass', 'sanoid_syncoid_private_key', 'notes') }}" + sanoid_syncoid_destination_host: true + +``` diff --git a/friedhof/mgrote_zfs_sanoid_mit_syncoid/defaults/main.yml b/friedhof/mgrote_zfs_sanoid_mit_syncoid/defaults/main.yml new file mode 100644 index 00000000..78cf8310 --- /dev/null +++ b/friedhof/mgrote_zfs_sanoid_mit_syncoid/defaults/main.yml @@ -0,0 +1,49 @@ +--- +### when should sanoid be run (every 5 minutes) +sanoid_timer: '*-*-* *:00/5' +### when should syncoid be run +sanoid_syncoid_timer: '*-*-* *:00:00' + +# ### "Default" Datasets +# sanoid_datasets: # dictionary +# - path: 'hdd_data/data' # path to dataset; without leading / +# template: 'fiveminutes' # name +# recursive: 'no' # recursive snapshotting +# snapshots: true # (de)activate; can be used to disable snapshotting of subdatasets if recursive is set +# - path: 'hdd_data/test' +# snapshots: false # deaktiviert sanoid für das dataset +# +# ### Templates +# sanoid_templates: +# - name: 'fiveminutes' +# keep_hourly: '24' # Aufheben (Stunde) +# keep_daily: '31' # Aufheben (Tage) +# keep_monthly: '6' # Aufheben (Monate) +# keep_yearly: '0' # Aufheben (Jahre) +# frequently: '36' # Aufheben (Minuten) +# frequent_period: '5' # Intervall (alle 5 Minuten) +# autosnap: 'yes' # Automatisches erstellen von Snapshots +# autoprune: 'yes' + +### user and group for sanoid +sanoid_user: sanoid +sanoid_user_group: sanoid + +### enable/disable features +## enable snapshotting +# sanoid_snaps_enable: true +## enable sending snaps +# sanoid_syncoid_source_host: true +## enable receiving snaps +# sanoid_syncoid_destination_host: true + +# syncoid +#sanoid_syncoid_ssh_privkey: "{{ lookup('viczem.keepass.keepass', 'sanoid_syncoid_private_key', 'notes') }}" +#sanoid_syncoid_ssh_pubkey: "{{ lookup('viczem.keepass.keepass', 'sanoid_syncoid_public_key', 'notes') }}" + +### mgrote_sanoid +#sanoid_syncoid_datasets_sync: +# - source_host: pve5.mgrote.net +# source_dataset: hdd_data/tmp +# destination_mount_check: hdd_data/tmp # zielpool +# destination_dataset: backup/pve5/tmp diff --git a/friedhof/mgrote_zfs_sanoid_mit_syncoid/handlers/main.yml b/friedhof/mgrote_zfs_sanoid_mit_syncoid/handlers/main.yml new file mode 100644 index 00000000..ab3f5feb --- /dev/null +++ b/friedhof/mgrote_zfs_sanoid_mit_syncoid/handlers/main.yml @@ -0,0 +1,5 @@ +--- +- name: systemctl daemon-reload + become: true + ansible.builtin.systemd: + daemon_reload: true diff --git a/roles/mgrote_zfs_sanoid/tasks/destination.yml b/friedhof/mgrote_zfs_sanoid_mit_syncoid/tasks/destination.yml similarity index 100% rename from roles/mgrote_zfs_sanoid/tasks/destination.yml rename to friedhof/mgrote_zfs_sanoid_mit_syncoid/tasks/destination.yml diff --git a/friedhof/mgrote_zfs_sanoid_mit_syncoid/tasks/main.yml b/friedhof/mgrote_zfs_sanoid_mit_syncoid/tasks/main.yml new file mode 100644 index 00000000..30e0bbd1 --- /dev/null +++ b/friedhof/mgrote_zfs_sanoid_mit_syncoid/tasks/main.yml @@ -0,0 +1,78 @@ +--- +- name: include user tasks + ansible.builtin.include_tasks: user.yml + +- name: install packages from repo + become: true + ansible.builtin.apt: + name: + - mbuffer + - lzop + - libcapture-tiny-perl + - pv + - libconfig-ini-perl + - sanoid + state: present + +- name: Overwrite syncoid script from package + become: true + ansible.builtin.get_url: + url: https://raw.githubusercontent.com/jimsalterjrs/sanoid/master/syncoid + dest: /usr/bin/syncoid + mode: '0755' + owner: root + group: root + force: true + +- name: create sanoid directories + become: true + ansible.builtin.file: + path: "{{ item }}" + state: directory + owner: "{{ sanoid_user }}" + group: "{{ sanoid_user_group }}" + mode: "0700" + with_items: + - "/etc/sanoid" + - "/etc/sanoid/.ssh" + +- name: include snaps tasks + ansible.builtin.include_tasks: snaps.yml + when: + - sanoid_datasets is defined + - sanoid_templates is defined + - sanoid_snaps_enable is defined + - sanoid_snaps_enable + +- name: ensure timers are enabled + become: true + ansible.builtin.systemd: + state: started + name: "{{ item }}" + daemon_reload: true + masked: false + enabled: true + loop: + - sanoid.timer + +- name: ensure services are enabled + become: true + ansible.builtin.systemd: + name: "{{ item }}" + masked: false + enabled: true + loop: + - sanoid.service + - sanoid-prune.service + +- name: include source-host tasks + ansible.builtin.include_tasks: source.yml + when: + - sanoid_syncoid_source_host is defined and sanoid_syncoid_source_host is true + - sanoid_syncoid_ssh_pubkey is defined + +- name: include destination-host tasks + ansible.builtin.include_tasks: destination.yml + when: + - sanoid_syncoid_destination_host is defined and sanoid_syncoid_destination_host is true + - sanoid_syncoid_ssh_privkey is defined diff --git a/friedhof/mgrote_zfs_sanoid_mit_syncoid/tasks/snaps.yml b/friedhof/mgrote_zfs_sanoid_mit_syncoid/tasks/snaps.yml new file mode 100644 index 00000000..5a6b6aac --- /dev/null +++ b/friedhof/mgrote_zfs_sanoid_mit_syncoid/tasks/snaps.yml @@ -0,0 +1,46 @@ +--- +- name: Generate Sanoid Configuration + become: true + ansible.builtin.template: + src: sanoid.conf.j2 + dest: "/etc/sanoid/sanoid.conf" + owner: "{{ sanoid_user }}" + group: "{{ sanoid_user_group }}" + mode: "0400" + +- name: template sanoid_mail.service + become: true + ansible.builtin.template: + src: "sanoid_mail.service.j2" + dest: /etc/systemd/system/sanoid_mail.service + owner: root + group: root + mode: "0644" + notify: + - systemctl daemon-reload + +- name: add overrides (sanoid_mail + TZ) + become: true + ansible.builtin.template: + src: "overrides.j2" + mode: "0644" + owner: root + group: root + dest: /lib/systemd/system/sanoid.service.d/override.conf + notify: + - systemctl daemon-reload + +- name: set timer + become: true + ansible.builtin.blockinfile: + create: true + mode: "0644" + owner: root + group: root + path: /lib/systemd/system/sanoid.timer.d/override.conf + block: | + [Timer] + OnCalendar = {{ sanoid_timer }} + when: sanoid_timer is defined + notify: + - systemctl daemon-reload diff --git a/roles/mgrote_zfs_sanoid/tasks/source.yml b/friedhof/mgrote_zfs_sanoid_mit_syncoid/tasks/source.yml similarity index 100% rename from roles/mgrote_zfs_sanoid/tasks/source.yml rename to friedhof/mgrote_zfs_sanoid_mit_syncoid/tasks/source.yml diff --git a/friedhof/mgrote_zfs_sanoid_mit_syncoid/tasks/user.yml b/friedhof/mgrote_zfs_sanoid_mit_syncoid/tasks/user.yml new file mode 100644 index 00000000..541c63a2 --- /dev/null +++ b/friedhof/mgrote_zfs_sanoid_mit_syncoid/tasks/user.yml @@ -0,0 +1,19 @@ +--- +- name: ensure group exists + become: true + ansible.builtin.group: + name: "{{ sanoid_user_group }}" + state: present + when: + - sanoid_user_group is defined + - sanoid_user is defined + +- name: ensure user exists + become: true + ansible.builtin.user: + name: "{{ sanoid_user }}" + group: "{{ sanoid_user_group }}" + create_home: true + when: + - sanoid_user_group is defined + - sanoid_user is defined diff --git a/friedhof/mgrote_zfs_sanoid_mit_syncoid/templates/overrides.j2 b/friedhof/mgrote_zfs_sanoid_mit_syncoid/templates/overrides.j2 new file mode 100644 index 00000000..e9033464 --- /dev/null +++ b/friedhof/mgrote_zfs_sanoid_mit_syncoid/templates/overrides.j2 @@ -0,0 +1,6 @@ +{{ file_header | default () }} + +[Unit] +OnFailure = sanoid_mail.service +[Service] +Environment=TZ=Europe/Berlin diff --git a/friedhof/mgrote_zfs_sanoid_mit_syncoid/templates/private_key.j2 b/friedhof/mgrote_zfs_sanoid_mit_syncoid/templates/private_key.j2 new file mode 100644 index 00000000..de719dbf --- /dev/null +++ b/friedhof/mgrote_zfs_sanoid_mit_syncoid/templates/private_key.j2 @@ -0,0 +1 @@ +{{ sanoid_syncoid_ssh_privkey }} diff --git a/friedhof/mgrote_zfs_sanoid_mit_syncoid/templates/sanoid.conf.j2 b/friedhof/mgrote_zfs_sanoid_mit_syncoid/templates/sanoid.conf.j2 new file mode 100644 index 00000000..26fa7f80 --- /dev/null +++ b/friedhof/mgrote_zfs_sanoid_mit_syncoid/templates/sanoid.conf.j2 @@ -0,0 +1,25 @@ +{{ file_header | default () }} +## ZFS Section -------------------------------- ## +{% for item in sanoid_datasets if item.snapshots is sameas true %} +[{{ item.path }}] + use_template = {{ item.template }} + recursive = {{ item.recursive }} +## -------------------------------------------- ## +{% endfor %} + +## Template Section --------------------------- ## +{% for item in sanoid_templates %} +[template_{{ item.name }}] + ## Keep-Rules + hourly = {{ item.keep_hourly }} + daily = {{ item.keep_daily }} + monthly = {{ item.keep_monthly }} + yearly = {{ item.keep_yearly }} + frequently = {{ item.frequently }} + ## Interval + frequent_period = {{ item.frequent_period }} + ## Other Options + autosnap = {{ item.autosnap }} + autoprune = {{ item.autoprune }} +## -------------------------------------------- ## +{% endfor %} diff --git a/friedhof/mgrote_zfs_sanoid_mit_syncoid/templates/sanoid_mail.service.j2 b/friedhof/mgrote_zfs_sanoid_mit_syncoid/templates/sanoid_mail.service.j2 new file mode 100644 index 00000000..3c3a9727 --- /dev/null +++ b/friedhof/mgrote_zfs_sanoid_mit_syncoid/templates/sanoid_mail.service.j2 @@ -0,0 +1,8 @@ +{{ file_header | default () }} + +[Unit] +Description=Send a Mail in case of an error in sanoid.service. + +[Service] +Type=oneshot +ExecStart=/bin/bash -c '/bin/systemctl status sanoid.service | mail -aFROM:sanoid@mgrote.net -s "[ERROR] sanoid - %H" {{ my_mail }}' diff --git a/friedhof/mgrote_zfs_sanoid_mit_syncoid/templates/syncoid.service.j2 b/friedhof/mgrote_zfs_sanoid_mit_syncoid/templates/syncoid.service.j2 new file mode 100644 index 00000000..af61c7f5 --- /dev/null +++ b/friedhof/mgrote_zfs_sanoid_mit_syncoid/templates/syncoid.service.j2 @@ -0,0 +1,10 @@ +{{ file_header | default () }} + +[Unit] +Description=Send zfs snapshots with sanoid/syncoid. +OnFailure=syncoid_mail.service +OnSuccess=syncoid_mail.service + +[Service] +Type=simple +ExecStart=/usr/bin/syncoid.sh diff --git a/friedhof/mgrote_zfs_sanoid_mit_syncoid/templates/syncoid.sh.j2 b/friedhof/mgrote_zfs_sanoid_mit_syncoid/templates/syncoid.sh.j2 new file mode 100644 index 00000000..68b2f752 --- /dev/null +++ b/friedhof/mgrote_zfs_sanoid_mit_syncoid/templates/syncoid.sh.j2 @@ -0,0 +1,12 @@ +#!/bin/bash +{{ file_header | default () }} + +# check if dest-dataset is mounted (sed: entferne 1. Zeile; awk: zeige nur yes/no; grep: RC1 when != yes) +{% for item in sanoid_syncoid_datasets_sync %} +# check if target dataset is mounted +/usr/sbin/zfs get mounted -H {{ item.destination_mount_check }} 2>&1 > /dev/null || echo "Pool not mounted!" +# check if source host is reachable +ping -c1 -W1 {{ item.source_host }} > /dev/null || {{ item.source_host }} not reachable! +# syncoid +export HOME=/root ; /usr/bin/syncoid --compress=zstd-fast --sshoption=StrictHostKeyChecking=no --delete-target-snapshots --use-hold --preserve-recordsize --sshkey "/etc/sanoid/.ssh/id_sanoid" --source-bwlimit {{ sanoid_syncoid_bwlimit }} {{ sanoid_user }}@{{ item.source_host }}:{{ item.source_dataset }} {{ item.destination_dataset }} +{% endfor %} diff --git a/friedhof/mgrote_zfs_sanoid_mit_syncoid/templates/syncoid.timer.j2 b/friedhof/mgrote_zfs_sanoid_mit_syncoid/templates/syncoid.timer.j2 new file mode 100644 index 00000000..16438ec7 --- /dev/null +++ b/friedhof/mgrote_zfs_sanoid_mit_syncoid/templates/syncoid.timer.j2 @@ -0,0 +1,9 @@ +{{ file_header | default () }} +[Unit] +Description=Timer for syncoid. + +[Timer] +OnCalendar={{ sanoid_syncoid_timer }} + +[Install] +WantedBy=timers.target multi-user.target zfs.target diff --git a/friedhof/mgrote_zfs_sanoid_mit_syncoid/templates/syncoid_mail.service.j2 b/friedhof/mgrote_zfs_sanoid_mit_syncoid/templates/syncoid_mail.service.j2 new file mode 100644 index 00000000..caa59b24 --- /dev/null +++ b/friedhof/mgrote_zfs_sanoid_mit_syncoid/templates/syncoid_mail.service.j2 @@ -0,0 +1,8 @@ +{{ file_header | default () }} + +[Unit] +Description=Send a Mail for sanoid service after error or success sanoid.service. + +[Service] +Type=oneshot +ExecStart=/bin/bash -c '/usr/bin/journalctl -u syncoid.service -n 30 | mail -aFROM:syncoid@mgrote.net -s "syncoid - %H" {{ my_mail }}' diff --git a/group_vars/all.yml b/group_vars/all.yml index 0764c61d..82ca1d13 100644 --- a/group_vars/all.yml +++ b/group_vars/all.yml @@ -202,9 +202,6 @@ sanoid_templates: autosnap: 'yes' autoprune: 'yes' -### mgrote_zfs_sanoid -sanoid_deb_url: http://docker10.mgrote.net:3344/sanoid_v2.2.0.deb - ### mgrote_munin_node munin_node_plugins_repo_user: "{{ ansible_forgejo_user }}" munin_node_plugins_repo_user_pass: "{{ ansible_forgejo_user_pass }}" @@ -247,6 +244,15 @@ munin_node_plugins: env.config_dir /etc/fail2ban user root +### mgrote_sync (für pbs + pve) +rsync_mirror_user_group: "{{ rsync_mirror_user }}" +rsync_mirror_user: rsync_mirror +rsync_mirror_bw_limit: "4m" # 4 Megabytes +rsync_mirror_timer: '*-*-* 0/8:*:*' # alle 8 h + +rsync_mirror_private_key: "{{ lookup('viczem.keepass.keepass', 'rsync_mirror_private_key', 'notes') }}" +rsync_mirror_public_key: "{{ lookup('viczem.keepass.keepass', 'rsync_mirror_public_key', 'notes') }}" + # Ansible Variablen ### User ansible_user: "ansible-user" diff --git a/group_vars/munin.yml b/group_vars/munin.yml index 0648cc1d..29f4e06f 100644 --- a/group_vars/munin.yml +++ b/group_vars/munin.yml @@ -104,7 +104,7 @@ munin_node_plugins: src: https://git.mgrote.net/mirrors/munin-contrib/raw/branch/master/plugins/http/http_response config: | [http_response] - env.sites https://git.mgrote.net http://ldap.mgrote.net:17170 https://docker10.mgrote.net:8443 https://registry.mgrote.net/ui/ http://docker10.mgrote.net:3344 http://munin.mgrote.net http://192.168.5.1 http://192.168.3.1 http://192.168.3.108:8080 http://192.168.3.204 http://docker10.mgrote.net:6483 https://miniflux.mgrote.net/ https://nextcloud.mgrote.net https://audio.mgrote.net/mg http://wiki.mgrote.net + env.sites https://git.mgrote.net http://ldap.mgrote.net:17170 https://docker10.mgrote.net:8443 https://registry.mgrote.net/ui/ http://munin.mgrote.net http://192.168.5.1 http://192.168.3.1 http://192.168.3.108:8080 http://192.168.3.204 http://docker10.mgrote.net:6483 https://miniflux.mgrote.net/ https://nextcloud.mgrote.net https://audio.mgrote.net/mg http://wiki.mgrote.net env.max_time 20 env.short_label true env.follow_redirect true diff --git a/host_vars/docker10.mgrote.net.yml b/host_vars/docker10.mgrote.net.yml index 0574b358..de6b330c 100644 --- a/host_vars/docker10.mgrote.net.yml +++ b/host_vars/docker10.mgrote.net.yml @@ -41,8 +41,6 @@ compose_files: - name: nextcloud state: present network: traefik - - name: httpd - state: present - name: unifi-network-application state: present - name: miniflux diff --git a/host_vars/pbs-test.mgrote.net.yml b/host_vars/pbs-test.mgrote.net.yml index 31ffe738..be8a5bc8 100644 --- a/host_vars/pbs-test.mgrote.net.yml +++ b/host_vars/pbs-test.mgrote.net.yml @@ -74,74 +74,6 @@ zfs_extra_zfs_pools: ### mgrote_zfs_sanoid sanoid_snaps_enable: true - -## syncoid -sanoid_syncoid_destination_host: false -sanoid_syncoid_ssh_privkey: "{{ lookup('viczem.keepass.keepass', 'sanoid_syncoid_private_key', 'notes') }}" -sanoid_syncoid_timer: '*-*-* *:00:00' # jede Stunde -sanoid_syncoid_bwlimit: 30m # 30MB/s -sanoid_syncoid_datasets_sync: - - source_host: pve5.mgrote.net - destination_mount_check: backup - destination_dataset: backup/pve5/pve_backup - source_dataset: hdd_data/pve_backup - - - source_host: pve5.mgrote.net - destination_mount_check: backup - destination_dataset: backup/pve5/videos - source_dataset: hdd_data/videos - - - source_host: pve5.mgrote.net - destination_mount_check: backup - destination_dataset: backup/pve5/music - source_dataset: hdd_data/music - - - source_host: pve5.mgrote.net - destination_mount_check: backup - destination_dataset: backup/pve5/tmp - source_dataset: hdd_data/tmp - - - source_host: pve5.mgrote.net - destination_mount_check: backup - destination_dataset: backup/pve5/archiv - source_dataset: hdd_data/archiv - - - source_host: pve5.mgrote.net - destination_mount_check: backup - destination_dataset: backup/pve5/bilder - source_dataset: hdd_data/bilder - - - source_host: pve5.mgrote.net - destination_mount_check: backup - destination_dataset: backup/pve5/scans - source_dataset: hdd_data/scans - - - source_host: pve5.mgrote.net - destination_mount_check: backup - destination_dataset: backup/pve5/restic - source_dataset: hdd_data/restic - - - source_host: pve5.mgrote.net - destination_mount_check: backup - destination_dataset: backup/pve5/backup - source_dataset: hdd_data/backup - - - source_host: pve5.mgrote.net - destination_mount_check: backup - destination_dataset: backup/pve5/buecher - source_dataset: hdd_data/buecher - - - source_host: pve5.mgrote.net - destination_mount_check: backup - destination_dataset: backup/pve5/programme - source_dataset: hdd_data/programme - - - source_host: pve5.mgrote.net - destination_mount_check: backup - destination_dataset: backup/pve5/vm - source_dataset: hdd_data/vm - -# sanoid sanoid_datasets: ### rpool - path: rpool diff --git a/host_vars/pbs.mgrote.net.yml b/host_vars/pbs.mgrote.net.yml index f9315299..52d4e97c 100644 --- a/host_vars/pbs.mgrote.net.yml +++ b/host_vars/pbs.mgrote.net.yml @@ -58,6 +58,42 @@ zfs_datasets: # DatenPools werden hier nicht verwaltet - dataset: backup/pve5 state: present canmount: off # noqa yaml[truthy] + compression: zstd + sync: disabled + xattr: sa + dnodesize: auto + atime: on # noqa yaml[truthy] + snapdir: hidden + reservation: 1G + acltype: posix # https:///docs.ansible.com/ansible-core/2.14/playbook_guide/playbooks_privilege_escalation.html#risks-of-becoming-an-unprivileged-user ; sonst kann die dotfiles-Rolle kein setfacl machen + - dataset: backup/pve5/pve_backup + state: present + recordsize: 1M + - dataset: backup/pve5/videos + state: present + recordsize: 1M + - dataset: backup/pve5/music + state: present + recordsize: 1M + - dataset: backup/pve5/tmp + state: present + - dataset: backup/pve5/archiv + state: present + - dataset: backup/pve5/bilder + state: present + recordsize: 1M + - dataset: backup/pve5/scans + state: present + - dataset: backup/pve5/restic + state: present + - dataset: backup/pve5/backup + state: present + - dataset: backup/pve5/buecher + state: present + - dataset: backup/pve5/programme + state: present + - dataset: backup/pve5/vm + state: absent # todo # Variablen für mgrote.zfs_health/trim/scrub/zed/arc_mem/ sind zusammengefasst unter zfs_extra_* zfs_extra_arc_max_size: "4294967296" # 4GB in Bytes zfs_extra_zfs_pools: @@ -68,74 +104,6 @@ zfs_extra_zfs_pools: ### mgrote_zfs_sanoid sanoid_snaps_enable: true - -## syncoid -sanoid_syncoid_destination_host: true -sanoid_syncoid_ssh_privkey: "{{ lookup('viczem.keepass.keepass', 'sanoid_syncoid_private_key', 'notes') }}" -sanoid_syncoid_timer: '*-*-* *:00:00' # jede Stunde -sanoid_syncoid_bwlimit: 50M # 30MB/s -sanoid_syncoid_datasets_sync: - - source_host: 192.168.2.16 # pve5, weil pbs den fqdn nicht auflösen kann - destination_mount_check: backup - destination_dataset: backup/pve5/pve_backup - source_dataset: hdd_data/pve_backup - - - source_host: 192.168.2.16 # pve5, weil pbs den fqdn nicht auflösen kann - destination_mount_check: backup - destination_dataset: backup/pve5/videos - source_dataset: hdd_data/videos - - - source_host: 192.168.2.16 # pve5, weil pbs den fqdn nicht auflösen kann - destination_mount_check: backup - destination_dataset: backup/pve5/music - source_dataset: hdd_data/music - - - source_host: 192.168.2.16 # pve5, weil pbs den fqdn nicht auflösen kann - destination_mount_check: backup - destination_dataset: backup/pve5/tmp - source_dataset: hdd_data/tmp - - - source_host: 192.168.2.16 # pve5, weil pbs den fqdn nicht auflösen kann - destination_mount_check: backup - destination_dataset: backup/pve5/archiv - source_dataset: hdd_data/archiv - - - source_host: 192.168.2.16 # pve5, weil pbs den fqdn nicht auflösen kann - destination_mount_check: backup - destination_dataset: backup/pve5/bilder - source_dataset: hdd_data/bilder - - - source_host: 192.168.2.16 # pve5, weil pbs den fqdn nicht auflösen kann - destination_mount_check: backup - destination_dataset: backup/pve5/scans - source_dataset: hdd_data/scans - - - source_host: 192.168.2.16 # pve5, weil pbs den fqdn nicht auflösen kann - destination_mount_check: backup - destination_dataset: backup/pve5/restic - source_dataset: hdd_data/restic - - - source_host: 192.168.2.16 # pve5, weil pbs den fqdn nicht auflösen kann - destination_mount_check: backup - destination_dataset: backup/pve5/backup - source_dataset: hdd_data/backup - - - source_host: 192.168.2.16 # pve5, weil pbs den fqdn nicht auflösen kann - destination_mount_check: backup - destination_dataset: backup/pve5/buecher - source_dataset: hdd_data/buecher - - - source_host: 192.168.2.16 # pve5, weil pbs den fqdn nicht auflösen kann - destination_mount_check: backup - destination_dataset: backup/pve5/programme - source_dataset: hdd_data/programme - - - source_host: 192.168.2.16 # pve5, weil pbs den fqdn nicht auflösen kann - destination_mount_check: backup - destination_dataset: backup/pve5/vm - source_dataset: hdd_data/vm - -# sanoid sanoid_datasets: ### rpool - path: rpool @@ -155,3 +123,50 @@ sanoid_datasets: recursive: 'no' snapshots: true template: '3tage' + - path: 'backup/pve5/videos' + template: '14tage' + recursive: 'yes' + snapshots: true + - path: 'backup/pve5/music' + template: '14tage' + recursive: 'yes' + snapshots: true + - path: 'backup/pve5/tmp' + template: '14tage' + recursive: 'yes' + snapshots: true + - path: 'backup/pve5/pve_backup' + template: '14tage' + recursive: 'yes' + snapshots: true + - path: 'backup/pve5/archiv' + template: '14tage' + recursive: 'yes' + snapshots: true + - path: backup/pve5/bilder + recursive: 'no' # noqa yaml[truthy] + snapshots: true + template: '14tage' + - path: backup/pve5/scans + recursive: 'no' # noqa yaml[truthy] + snapshots: true + template: '14tage' + - path: backup/pve5/backup + recursive: 'no' # noqa yaml[truthy] + snapshots: true + template: '14tage' + - path: backup/pve5/restic + recursive: 'no' # noqa yaml[truthy] + snapshots: true + template: '14tage' + - path: backup/pve5/programme + recursive: 'no' # noqa yaml[truthy] + snapshots: true + template: '14tage' + - path: backup/pve5/buecher + recursive: 'no' # noqa yaml[truthy] + snapshots: true + template: '14tage' + +### mgrote_rsync +rsync_host_role: destination diff --git a/host_vars/pve5.mgrote.net.yml b/host_vars/pve5.mgrote.net.yml index 34e3adc6..b3eea196 100644 --- a/host_vars/pve5.mgrote.net.yml +++ b/host_vars/pve5.mgrote.net.yml @@ -9,7 +9,6 @@ ## hdd_data "neu" ### sudo zpool create -o ashift=12 -o feature@encryption=enabled -O encryption=on -O keylocation=prompt -O keyformat=passphrase hdd_data /dev/disk/by-id/ata-ST18000NM003D-3DL103_ZVTBSAYS - # mgrote.zfs_manage_datasets ### mgrote_zfs_extra # Variablen für mgrote.zfs_health/trim/scrub/zed/arc_mem/ sind zusammengefasst unter zfs_extra_* @@ -99,9 +98,6 @@ zfs_extra_zfs_pools: ### mgrote_zfs_sanoid sanoid_snaps_enable: true -## enable sending snaps -sanoid_syncoid_source_host: true -sanoid_syncoid_ssh_pubkey: "{{ lookup('viczem.keepass.keepass', 'sanoid_syncoid_public_key', 'notes') }}" sanoid_datasets: ### hdd_data - path: 'hdd_data/videos' @@ -152,10 +148,6 @@ sanoid_datasets: recursive: 'no' # noqa yaml[truthy] snapshots: true template: '14tage' - - path: hdd_data/vm - recursive: 'no' # noqa yaml[truthy] - snapshots: true - template: '14tage' ### rpool - path: rpool recursive: 'no' # noqa yaml[truthy] @@ -234,3 +226,32 @@ pve_pbs_datastore: username: user_pve5@pbs password: "{{ lookup('viczem.keepass.keepass', 'pbs_pve_user', 'password') }}" fingerprint: "7F:AC:54:75:1C:33:55:84:1E:1E:3A:15:5A:5E:AF:79:33:C9:D4:E1:C0:A0:1C:0D:9E:6A:EA:82:F9:27:57:79" + +### mgrote_sync +rsync_host_role: source +rsync_mirror_dirs: # bei Src+Dest KEIN "/" am Ende + - src: /hdd_data/tmp + dest: "{{ rsync_mirror_user }}@pbs.mgrote.net:/backup/pve5/tmp" + - src: /hdd_data/archiv + dest: "{{ rsync_mirror_user }}@pbs.mgrote.net:/backup/pve5/archiv" + - src: /hdd_data/backup + dest: "{{ rsync_mirror_user }}@pbs.mgrote.net:/backup/pve5/backup" + - src: /hdd_data/bilder + dest: "{{ rsync_mirror_user }}@pbs.mgrote.net:/backup/pve5/bilder" + - src: /hdd_data/buecher + dest: "{{ rsync_mirror_user }}@pbs.mgrote.net:/backup/pve5/buecher" + - src: /hdd_data/music + dest: "{{ rsync_mirror_user }}@pbs.mgrote.net:/backup/pve5/music" + - src: /hdd_data/programme + dest: "{{ rsync_mirror_user }}@pbs.mgrote.net:/backup/pve5/programme" + - src: /hdd_data/pve_backup + dest: "{{ rsync_mirror_user }}@pbs.mgrote.net:/backup/pve5/pve_backup" + - src: /hdd_data/restic + dest: "{{ rsync_mirror_user }}@pbs.mgrote.net:/backup/pve5/restic" + - src: /hdd_data/scans + dest: "{{ rsync_mirror_user }}@pbs.mgrote.net:/backup/pve5/scans" + - src: /hdd_data/tmp + dest: "{{ rsync_mirror_user }}@pbs.mgrote.net:/backup/pve5/tmp" + - src: /hdd_data/videos + dest: "{{ rsync_mirror_user }}@pbs.mgrote.net:/backup/pve5/videos" +# hdd_data/vm ist mit Absicht nicht dabei, zu groß diff --git a/keepass_db.kdbx b/keepass_db.kdbx index c52b8762..d2f4b77d 100644 Binary files a/keepass_db.kdbx and b/keepass_db.kdbx differ diff --git a/playbooks/3_service/pbs.yml b/playbooks/3_service/pbs.yml index 9c3cccb6..4443545d 100644 --- a/playbooks/3_service/pbs.yml +++ b/playbooks/3_service/pbs.yml @@ -19,3 +19,5 @@ tags: "pbs_users" - role: mgrote_pbs_datastores tags: "pbs_datastores" + - role: mgrote_rsync + tags: "rsync" diff --git a/playbooks/3_service/pve.yml b/playbooks/3_service/pve.yml index 1304eed7..345250a4 100644 --- a/playbooks/3_service/pve.yml +++ b/playbooks/3_service/pve.yml @@ -24,3 +24,5 @@ tags: "lxc-profile" - role: mgrote_pbs_pve_integration tags: "pbs" + - role: mgrote_rsync + tags: "rsync" diff --git a/roles/mgrote_rsync/defaults/main.yml b/roles/mgrote_rsync/defaults/main.yml new file mode 100644 index 00000000..e79db865 --- /dev/null +++ b/roles/mgrote_rsync/defaults/main.yml @@ -0,0 +1,37 @@ +# --- +# rsync_mirror_user_group: "{{ rsync_mirror_user }}" +# rsync_mirror_user: rsync_mirror +# rsync_mirror_bw_limit: "2m" # 2 Megabytes +# rsync_mirror_timer: '*-*-* 23:00:00' # jeden Tag um 2300 +# +# rsync_mirror_private_key: "{{ lookup('viczem.keepass.keepass', 'rsync_mirror_private_key', 'notes') }}" +# rsync_mirror_public_key: "{{ lookup('viczem.keepass.keepass', 'rsync_mirror_public_key', 'notes') }}" +# +# rsync_mirror_dirs: # "/" beachten, bei Src+Dest "/" KEIN am Ende +# - src: /hdd_data/tmp +# dest: "{{ rsync_mirror_user }}@pbs.mgrote.net:/backup/pve5/tmp" +# - src: hdd_data/archiv +# dest: "{{ rsync_mirror_user }}@pbs.mgrote.net:/backup/pve5/archiv" +# - src: hdd_data/backup +# dest: "{{ rsync_mirror_user }}@pbs.mgrote.net:/backup/pve5/backup" +# - src: hdd_data/bilder +# dest: "{{ rsync_mirror_user }}@pbs.mgrote.net:/backup/pve5/bilder" +# - src: hdd_data/buecher +# dest: "{{ rsync_mirror_user }}@pbs.mgrote.net:/backup/pve5/buecher" +# - src: hdd_data/music +# dest: "{{ rsync_mirror_user }}@pbs.mgrote.net:/backup/pve5/music" +# - src: hdd_data/programme +# dest: "{{ rsync_mirror_user }}@pbs.mgrote.net:/backup/pve5/programme" +# - src: hdd_data/pve_backup +# dest: "{{ rsync_mirror_user }}@pbs.mgrote.net:/backup/pve5/pve_backup" +# - src: hdd_data/restic +# dest: "{{ rsync_mirror_user }}@pbs.mgrote.net:/backup/pve5/restic" +# - src: hdd_data/scans +# dest: "{{ rsync_mirror_user }}@pbs.mgrote.net:/backup/pve5/scans" +# - src: hdd_data/tmp +# dest: "{{ rsync_mirror_user }}@pbs.mgrote.net:/backup/pve5/tmp" +# - src: hdd_data/videos +# dest: "{{ rsync_mirror_user }}@pbs.mgrote.net:/backup/pve5/videos" +# - src: hdd_data/vm +# dest: "{{ rsync_mirror_user }}@pbs.mgrote.net:/backup/pve5/vm" +# diff --git a/roles/mgrote_rsync/handlers/main.yml b/roles/mgrote_rsync/handlers/main.yml new file mode 100644 index 00000000..ab3f5feb --- /dev/null +++ b/roles/mgrote_rsync/handlers/main.yml @@ -0,0 +1,5 @@ +--- +- name: systemctl daemon-reload + become: true + ansible.builtin.systemd: + daemon_reload: true diff --git a/roles/mgrote_rsync/tasks/destination.yml b/roles/mgrote_rsync/tasks/destination.yml new file mode 100644 index 00000000..1b2f6f9b --- /dev/null +++ b/roles/mgrote_rsync/tasks/destination.yml @@ -0,0 +1,6 @@ +--- +- name: Ensure SSH-Public-Key is templated + become: true + ansible.posix.authorized_key: + user: "{{ rsync_mirror_user }}" + key: "{{ rsync_mirror_public_key }}" diff --git a/roles/mgrote_rsync/tasks/main.yml b/roles/mgrote_rsync/tasks/main.yml new file mode 100644 index 00000000..ce731dc4 --- /dev/null +++ b/roles/mgrote_rsync/tasks/main.yml @@ -0,0 +1,21 @@ +--- +- name: Block + when: rsync_host_role is defined + block: + - name: Include user tasks + ansible.builtin.include_tasks: user.yml + + - name: Ensure packages are present + become: true + ansible.builtin.package: + name: + - rsync + state: present + + - name: Include source tasks + ansible.builtin.include_tasks: source.yml + when: "'source' in rsync_host_role" + + - name: Include destination tasks + ansible.builtin.include_tasks: destination.yml + when: "'destination' in rsync_host_role" diff --git a/roles/mgrote_rsync/tasks/source.yml b/roles/mgrote_rsync/tasks/source.yml new file mode 100644 index 00000000..4080e6ff --- /dev/null +++ b/roles/mgrote_rsync/tasks/source.yml @@ -0,0 +1,68 @@ +--- +- name: Ensure needed dirs exist + become: true + ansible.builtin.file: + path: "{{ item }}" + state: directory + owner: "{{ rsync_mirror_user }}" + group: "{{ rsync_mirror_user_group }}" + mode: "0700" + with_items: + - "/etc/rsync_mirror/" + - "/etc/rsync_mirror/.ssh" + - "/home/{{ rsync_mirror_user }}/.ssh" + +- name: Ensure SSH-Private-Key is templated + become: true + ansible.builtin.template: + src: private_key.j2 + dest: "/etc/rsync_mirror/.ssh/id_rsync_mirror" + owner: "{{ rsync_mirror_user }}" + group: "{{ rsync_mirror_user_group }}" + mode: "0400" + no_log: true + +- name: Ensure rsync_mirror-Script is templated + become: true + ansible.builtin.template: + src: "rsync_mirror.sh.j2" + dest: "/usr/bin/rsync_mirror.sh" + owner: "{{ rsync_mirror_user }}" + group: "{{ rsync_mirror_user_group }}" + mode: "0750" + +- name: Ensure services are present + become: true + ansible.builtin.template: + src: "{{ item }}.j2" + dest: "/etc/systemd/system/{{ item }}" + owner: root + group: root + mode: "0644" + notify: + - systemctl daemon-reload + loop: + - rsync_mirror.service + - rsync_mirror.timer + - rsync_mirror_mail.service + +- name: Ensure timer unit is enabled + become: true + ansible.builtin.systemd: + name: rsync_mirror.timer + enabled: true + masked: false + state: started + notify: + - systemctl daemon-reload + +- name: Ensure service units are enabled + become: true + ansible.builtin.systemd: + name: "{{ item }}" + masked: false + enabled: true + loop: + - rsync_mirror.service + - rsync_mirror.timer + - rsync_mirror_mail.service diff --git a/roles/mgrote_rsync/tasks/user.yml b/roles/mgrote_rsync/tasks/user.yml new file mode 100644 index 00000000..e417b4b2 --- /dev/null +++ b/roles/mgrote_rsync/tasks/user.yml @@ -0,0 +1,26 @@ +--- +- name: Ensure group exists + become: true + ansible.builtin.group: + name: "{{ rsync_mirror_user_group }}" + state: present + +- name: Ensure user exists + become: true + ansible.builtin.user: + name: "{{ rsync_mirror_user }}" + groups: + - "{{ rsync_mirror_user_group }}" + - root + - users + create_home: true # für .ssh + append: true + +- name: Ensure user is added to sudoers + become: true + community.general.sudoers: + name: "users-sudo-{{ rsync_mirror_user }}" + state: present + user: "{{ rsync_mirror_user }}" + commands: ALL + nopassword: true diff --git a/roles/mgrote_rsync/templates/private_key.j2 b/roles/mgrote_rsync/templates/private_key.j2 new file mode 100644 index 00000000..b88c79ae --- /dev/null +++ b/roles/mgrote_rsync/templates/private_key.j2 @@ -0,0 +1 @@ +{{ rsync_mirror_private_key }} diff --git a/roles/mgrote_rsync/templates/rsync_mirror.service.j2 b/roles/mgrote_rsync/templates/rsync_mirror.service.j2 new file mode 100644 index 00000000..2970ccd6 --- /dev/null +++ b/roles/mgrote_rsync/templates/rsync_mirror.service.j2 @@ -0,0 +1,10 @@ +{{ file_header | default () }} + +[Unit] +Description=Mirror data with rsync. +OnFailure=rsync_mirror_mail.service +OnSuccess=rsync_mirror_mail.service + +[Service] +Type=simple +ExecStart=/usr/bin/rsync_mirror.sh diff --git a/roles/mgrote_rsync/templates/rsync_mirror.sh.j2 b/roles/mgrote_rsync/templates/rsync_mirror.sh.j2 new file mode 100644 index 00000000..43f880fd --- /dev/null +++ b/roles/mgrote_rsync/templates/rsync_mirror.sh.j2 @@ -0,0 +1,24 @@ +#!/bin/bash +{{ file_header | default () }} + +{% for item in rsync_mirror_dirs %} +{# Header #} +echo "-----------------------" +echo "Source: {{ item.src }}" +echo "Destination: {{ item.dest.split(':') | last }}" +{# Mount check source #} +{# der führende / muss beim Dataset entfernt werden, sonst melden das Kommando immer "mounted" zurück #} +if [[ "$(/usr/sbin/zfs get mounted -H {{ item.src | regex_replace('^/', '') }} | cut -f3)" = "yes" ]] ; then + {# Mount check destination #} + if [[ "$(ssh -i /etc/rsync_mirror/.ssh/id_rsync_mirror -o StrictHostKeyChecking=no {{ item.dest.split(':') | first }} /usr/sbin/zfs get mounted -H {{ item.dest.split(':') | last | regex_replace('^/', '') }} | cut -f3)" = "yes" ]] ; then + rsync -e "ssh -i /etc/rsync_mirror/.ssh/id_rsync_mirror -o StrictHostKeyChecking=no" --bwlimit={{ rsync_mirror_bw_limit }} --archive --verbose --inplace --itemize-changes --omit-dir-times --human-readable --stats --compress --fuzzy --force --partial --delete-after --recursive {{ item.src }}/ {{ item.dest }}/ + {# "/" am Ende von Src+Dest ist Wichtig und notwendig, sonst wird in Unterordner kopiert #} + else + echo "Destination-Dataset not mounted!" + exit 1 + fi +else + echo "Source-Dataset not mounted!" + exit 1 +fi +{% endfor %} diff --git a/roles/mgrote_rsync/templates/rsync_mirror.timer.j2 b/roles/mgrote_rsync/templates/rsync_mirror.timer.j2 new file mode 100644 index 00000000..4b187cbf --- /dev/null +++ b/roles/mgrote_rsync/templates/rsync_mirror.timer.j2 @@ -0,0 +1,9 @@ +{{ file_header | default () }} +[Unit] +Description=Timer for rsync_mirror. + +[Timer] +OnCalendar={{ rsync_mirror_timer }} + +[Install] +WantedBy=timers.target multi-user.target zfs.target diff --git a/roles/mgrote_rsync/templates/rsync_mirror_mail.service.j2 b/roles/mgrote_rsync/templates/rsync_mirror_mail.service.j2 new file mode 100644 index 00000000..072df75e --- /dev/null +++ b/roles/mgrote_rsync/templates/rsync_mirror_mail.service.j2 @@ -0,0 +1,8 @@ +{{ file_header | default () }} + +[Unit] +Description=Send a Mail for rsync_mirror service after error or success rsync_mirror.service. + +[Service] +Type=oneshot +ExecStart=/bin/bash -c '/usr/bin/journalctl -u rsync_mirror.service -n 30 | mail -aFROM:{{ rsync_mirror_user }}@mgrote.net -s "rsync_mirror - %H" {{ my_mail }}' diff --git a/roles/mgrote_zfs_sanoid/README.md b/roles/mgrote_zfs_sanoid/README.md index 552ed0f0..2b95eb3c 100644 --- a/roles/mgrote_zfs_sanoid/README.md +++ b/roles/mgrote_zfs_sanoid/README.md @@ -51,35 +51,3 @@ Es gibt 3 Funktionen: autoprune: 'yes' ``` - -### Beispiel - Snapshots senden und empfangen - -- Host 1 = Source -- Host 2 = Destination - - - -#### Variablen - Host 1 - -```yaml - sanoid_syncoid_source_host: true - sanoid_syncoid_ssh_pubkey: | - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC3U37DGPRPDLlgxZcM0Zj/x6RVZxs7hcWBYfPywujH4+mjbpzJckr2tx3QLfxsCCjQVb4LNSEB0xsOvzDjfDsaPuG4wzqFVyZOtjI4iWg/it4ARndun33r+xSlWc5JKHH9GRK8SBOd4lXv5ylENdhWQ7z5ZF/FtCysb1JHTTYlobgXfTZ4NswJj6BBk669l13uL6zSXq6x6vm1GWiFIcIYqwM5WGSGHFoD2RNn0TJKI9A3AULPloMzWeHG3fJhoVfNY6ZB0kqpTHGoAmJUURkBFki1cJkzx3tyto4VpTzZmUyYg+qqIWbv7Me3YVJCln8JYD10uDb2oPRx6G3C9DlnzRmAVVbqCHzwvOY0H5TLTW7AXCHHgSdHaRym4oTUY9dDS/XFU3rHgexerBbi3sy1Tm0/dEU3cZFm4YOJXY/l4TeTRlhg2VbctsWE1BN1CZcoJRR+qNdJzM7Vl70Y6RGU92Y1rzSpooYVuyCFDrEIp0hAHidb5rs4paCvoxtVqak+LK8dcq0IbWxcxomEimeRG4+Opd3vo+U6subp5jqkOY0uYkFVJXaMHkP5ZIxlCFgif2A3YAPhz9IczRJaaNY3pbVgU7ybOBp+S8KRK8Ysk6OP5ApOTQVTlRhYeNqo7mpuW6139VRY5luekSCy3ehHCI9/MObhu2juF1Nz0HMeMQ== mg@irantu -``` - - -#### Variablen - Host 2 - -```yaml - sanoid_syncoid_timer: '*:*' - sanoid_syncoid_bwlimit: 30m - sanoid_syncoid_datasets_sync: - - source_host: host1.lan - source_dataset: hdd_data_mirror - destination_mount_check: hdd_data/encrypted # Wenn dieses Dataset nicht gemountet ist(z.B. durch Verschlüsselung, dann bricht syncoid ab) - destination_dataset: hdd_data/encrypted/syncoid/zfs1 - skip_parent: false - sanoid_syncoid_ssh_privkey: "{{ lookup('viczem.keepass.keepass', 'sanoid_syncoid_private_key', 'notes') }}" - sanoid_syncoid_destination_host: true - -``` diff --git a/roles/mgrote_zfs_sanoid/defaults/main.yml b/roles/mgrote_zfs_sanoid/defaults/main.yml index 78cf8310..a76ddae5 100644 --- a/roles/mgrote_zfs_sanoid/defaults/main.yml +++ b/roles/mgrote_zfs_sanoid/defaults/main.yml @@ -1,8 +1,6 @@ --- ### when should sanoid be run (every 5 minutes) sanoid_timer: '*-*-* *:00/5' -### when should syncoid be run -sanoid_syncoid_timer: '*-*-* *:00:00' # ### "Default" Datasets # sanoid_datasets: # dictionary @@ -32,18 +30,3 @@ sanoid_user_group: sanoid ### enable/disable features ## enable snapshotting # sanoid_snaps_enable: true -## enable sending snaps -# sanoid_syncoid_source_host: true -## enable receiving snaps -# sanoid_syncoid_destination_host: true - -# syncoid -#sanoid_syncoid_ssh_privkey: "{{ lookup('viczem.keepass.keepass', 'sanoid_syncoid_private_key', 'notes') }}" -#sanoid_syncoid_ssh_pubkey: "{{ lookup('viczem.keepass.keepass', 'sanoid_syncoid_public_key', 'notes') }}" - -### mgrote_sanoid -#sanoid_syncoid_datasets_sync: -# - source_host: pve5.mgrote.net -# source_dataset: hdd_data/tmp -# destination_mount_check: hdd_data/tmp # zielpool -# destination_dataset: backup/pve5/tmp diff --git a/roles/mgrote_zfs_sanoid/tasks/main.yml b/roles/mgrote_zfs_sanoid/tasks/main.yml index 30e0bbd1..4b664e80 100644 --- a/roles/mgrote_zfs_sanoid/tasks/main.yml +++ b/roles/mgrote_zfs_sanoid/tasks/main.yml @@ -14,16 +14,6 @@ - sanoid state: present -- name: Overwrite syncoid script from package - become: true - ansible.builtin.get_url: - url: https://raw.githubusercontent.com/jimsalterjrs/sanoid/master/syncoid - dest: /usr/bin/syncoid - mode: '0755' - owner: root - group: root - force: true - - name: create sanoid directories become: true ansible.builtin.file: @@ -64,15 +54,3 @@ loop: - sanoid.service - sanoid-prune.service - -- name: include source-host tasks - ansible.builtin.include_tasks: source.yml - when: - - sanoid_syncoid_source_host is defined and sanoid_syncoid_source_host is true - - sanoid_syncoid_ssh_pubkey is defined - -- name: include destination-host tasks - ansible.builtin.include_tasks: destination.yml - when: - - sanoid_syncoid_destination_host is defined and sanoid_syncoid_destination_host is true - - sanoid_syncoid_ssh_privkey is defined diff --git a/roles/mgrote_zfs_sanoid/tasks/snaps.yml b/roles/mgrote_zfs_sanoid/tasks/snaps.yml index 5a6b6aac..47b3b049 100644 --- a/roles/mgrote_zfs_sanoid/tasks/snaps.yml +++ b/roles/mgrote_zfs_sanoid/tasks/snaps.yml @@ -1,5 +1,5 @@ --- -- name: Generate Sanoid Configuration +- name: Template sanoid configuration become: true ansible.builtin.template: src: sanoid.conf.j2 @@ -8,7 +8,7 @@ group: "{{ sanoid_user_group }}" mode: "0400" -- name: template sanoid_mail.service +- name: Template sanoid_mail.service become: true ansible.builtin.template: src: "sanoid_mail.service.j2" @@ -30,7 +30,7 @@ notify: - systemctl daemon-reload -- name: set timer +- name: add timer overrides become: true ansible.builtin.blockinfile: create: true diff --git a/roles/mgrote_zfs_sanoid/tasks/user.yml b/roles/mgrote_zfs_sanoid/tasks/user.yml index 541c63a2..78d06f2b 100644 --- a/roles/mgrote_zfs_sanoid/tasks/user.yml +++ b/roles/mgrote_zfs_sanoid/tasks/user.yml @@ -1,5 +1,5 @@ --- -- name: ensure group exists +- name: Ensure group exists become: true ansible.builtin.group: name: "{{ sanoid_user_group }}" @@ -8,7 +8,7 @@ - sanoid_user_group is defined - sanoid_user is defined -- name: ensure user exists +- name: Ensure user exists become: true ansible.builtin.user: name: "{{ sanoid_user }}"