diff --git a/data/hostname/banco.softwareheritage.org.yaml b/data/hostname/banco.softwareheritage.org.yaml index b225cd5f..f72d8157 100644 --- a/data/hostname/banco.softwareheritage.org.yaml +++ b/data/hostname/banco.softwareheritage.org.yaml @@ -1,88 +1,87 @@ smtp::mynetworks: - 127.0.0.0/8 - "[::ffff:127.0.0.0]/104" - "[::1]/128" - 192.168.128.0/24 # storage array, for notification emails - 192.168.129.0/24 # storage array, for notification emails smtp::mail_aliases: - user: barman aliases: - root smtp::relayhost: '[pergamon.internal.softwareheritage.org]' backups::exclude: - srv/barman - - srv/rsnapshot - srv/softwareheritage/annex swh::apt_config::enable_non_free: true packages: - intel-microcode # open objstorage api swh::deploy::objstorage::backend::listen::host: 0.0.0.0 swh::deploy::objstorage::backend::workers: 16 swh::deploy::objstorage::ceph::keyring: /etc/softwareheritage/objstorage/ceph-keyring swh::deploy::objstorage::ceph::rados_id: swh-contents-rw ceph::client_keyrings: '/etc/softwareheritage/objstorage/ceph-keyring': owner: root group: swhstorage mode: '0640' keys: - "%{alias('swh::deploy::objstorage::ceph::rados_id')}" icinga2::host::vars: disks: disk /srv/storage/0: disk_wfree: '6%' disk_cfree: '3%' disk /srv/storage/1: disk_wfree: '6%' disk_cfree: '3%' disk /srv/storage/2: disk_wfree: '6%' disk_cfree: '3%' disk /srv/storage/3: disk_wfree: '6%' disk_cfree: '3%' disk /srv/storage/4: disk_wfree: '6%' disk_cfree: '3%' disk /srv/storage/5: disk_wfree: '6%' disk_cfree: '3%' disk /srv/storage/6: disk_wfree: '6%' disk_cfree: '3%' disk /srv/storage/7: disk_wfree: '6%' disk_cfree: '3%' disk /srv/storage/8: disk_wfree: '6%' disk_cfree: '3%' disk /srv/storage/9: disk_wfree: '6%' disk_cfree: '3%' disk /srv/storage/a: disk_wfree: '6%' disk_cfree: '3%' disk /srv/storage/b: disk_wfree: '6%' disk_cfree: '3%' disk /srv/storage/c: disk_wfree: '6%' disk_cfree: '3%' disk /srv/storage/d: disk_wfree: '6%' disk_cfree: '3%' disk /srv/storage/e: disk_wfree: '6%' disk_cfree: '3%' disk /srv/storage/f: disk_wfree: '6%' disk_cfree: '3%' diff --git a/site-modules/profile/manifests/rsnapshot/master.pp b/site-modules/profile/manifests/rsnapshot/master.pp deleted file mode 100644 index 5f515926..00000000 --- a/site-modules/profile/manifests/rsnapshot/master.pp +++ /dev/null @@ -1,45 +0,0 @@ -# Rsnapshot master host -class profile::rsnapshot::master { - - $backup_exclusion = lookup('backups::exclude', Array, 'unique') - - file {'/etc/rsnapshot.conf': - content => template('profile/swh/rsnapshot.conf.erb'), - owner => 'root', - group => 'root', - mode => '0644', - } - - file {'/srv/rsnapshot': - ensure => 'directory', - owner => 'root', - group => 'root', - mode => '0644', - } - - file { '/var/log/rsnapshot': - ensure => directory, - owner => $rsnapshot_user, - group => $rsnapshot_group, - mode => '0700', - } - - package { 'rsnapshot': - ensure => 'present', - } - - cron { 'rsnapshot_hourly': - command => '/usr/bin/rsnapshot hourly', - user => 'root', - hour => '*/4', - minute => '0', - } - - cron { 'rsnapshot_daily': - command => '/usr/bin/rsnapshot daily', - user => 'root', - hour => '22', - minute => '33', - } - -} diff --git a/site-modules/profile/templates/swh/rsnapshot.conf.erb b/site-modules/profile/templates/swh/rsnapshot.conf.erb deleted file mode 100644 index e06c8e6e..00000000 --- a/site-modules/profile/templates/swh/rsnapshot.conf.erb +++ /dev/null @@ -1,259 +0,0 @@ -################################################# -# rsnapshot.conf - rsnapshot configuration file # -################################################# -# # -# PLEASE BE AWARE OF THE FOLLOWING RULE: # -# # -# This file requires tabs between elements # -# # -################################################# - -####################### -# CONFIG FILE VERSION # -####################### - -config_version 1.2 - -########################### -# SNAPSHOT ROOT DIRECTORY # -########################### - -# All snapshots will be stored under this root directory. -# -snapshot_root /srv/rsnapshot/ - -# If no_create_root is enabled, rsnapshot will not automatically create the -# snapshot_root directory. This is particularly useful if you are backing -# up to removable media, such as a FireWire or USB drive. -# -#no_create_root 1 - -################################# -# EXTERNAL PROGRAM DEPENDENCIES # -################################# - -# LINUX USERS: Be sure to uncomment "cmd_cp". This gives you extra features. -# EVERYONE ELSE: Leave "cmd_cp" commented out for compatibility. -# -# See the README file or the man page for more details. -# -cmd_cp /bin/cp - -# uncomment this to use the rm program instead of the built-in perl routine. -# -cmd_rm /bin/rm - -# rsync must be enabled for anything to work. This is the only command that -# must be enabled. -# -cmd_rsync /usr/bin/rsync - -# Uncomment this to enable remote ssh backups over rsync. -# -cmd_ssh /usr/bin/ssh - -# Comment this out to disable syslog support. -# -cmd_logger /usr/bin/logger - -# Uncomment this to specify the path to "du" for disk usage checks. -# If you have an older version of "du", you may also want to check the -# "du_args" parameter below. -# -#cmd_du /usr/bin/du - -# Uncomment this to specify the path to rsnapshot-diff. -# -#cmd_rsnapshot_diff /usr/bin/rsnapshot-diff - -# Specify the path to a script (and any optional arguments) to run right -# before rsnapshot syncs files -# -#cmd_preexec /path/to/preexec/script - -# Specify the path to a script (and any optional arguments) to run right -# after rsnapshot syncs files -# -#cmd_postexec /path/to/postexec/script - -# Paths to lvcreate, lvremove, mount and umount commands, for use with -# Linux LVMs. -# -#linux_lvm_cmd_lvcreate /sbin/lvcreate -#linux_lvm_cmd_lvremove /sbin/lvremove -#linux_lvm_cmd_mount /bin/mount -#linux_lvm_cmd_umount /bin/umount - -######################################### -# BACKUP LEVELS / INTERVALS # -# Must be unique and in ascending order # -# e.g. alpha, beta, gamma, etc. # -######################################### - -retain hourly 6 -retain daily 7 -retain weekly 4 -retain monthly 12 - -############################################ -# GLOBAL OPTIONS # -# All are optional, with sensible defaults # -############################################ - -# Verbose level, 1 through 5. -# 1 Quiet Print fatal errors only -# 2 Default Print errors and warnings only -# 3 Verbose Show equivalent shell commands being executed -# 4 Extra Verbose Show extra verbose information -# 5 Debug mode Everything -# -verbose 2 - -# Same as "verbose" above, but controls the amount of data sent to the -# logfile, if one is being used. The default is 3. -# If you want the rsync output, you have to set it to 4 -# -loglevel 3 - -# If you enable this, data will be written to the file you specify. The -# amount of data written is controlled by the "loglevel" parameter. -# -logfile /var/log/rsnapshot.log - -# If enabled, rsnapshot will write a lockfile to prevent two instances -# from running simultaneously (and messing up the snapshot_root). -# If you enable this, make sure the lockfile directory is not world -# writable. Otherwise anyone can prevent the program from running. -# -lockfile /var/run/rsnapshot.pid - -# By default, rsnapshot check lockfile, check if PID is running -# and if not, consider lockfile as stale, then start -# Enabling this stop rsnapshot if PID in lockfile is not running -# -#stop_on_stale_lockfile 0 - -# Default rsync args. All rsync commands have at least these options set. -# -rsync_short_args -aH -#rsync_long_args --delete --numeric-ids --relative --delete-excluded - -# ssh has no args passed by default, but you can specify some here. -# -#ssh_args -p 22 - -# Default arguments for the "du" program (for disk space reporting). -# The GNU version of "du" is preferred. See the man page for more details. -# If your version of "du" doesn't support the -h flag, try -k flag instead. -# -#du_args -csh - -# If this is enabled, rsync won't span filesystem partitions within a -# backup point. This essentially passes the -x option to rsync. -# The default is 0 (off). -# -#one_fs 0 - -# The include and exclude parameters, if enabled, simply get passed directly -# to rsync. If you have multiple include/exclude patterns, put each one on a -# separate line. Please look up the --include and --exclude options in the -# rsync man page for more details on how to specify file name patterns. -# -#include ??? -#include ??? -#exclude ??? -<% @backup_exclusion.each do |item| - # Directly using item here will modify @backup_exclusion - # and potentially impact other templates - str = String.new(item.to_s) - str.insert(0,'/') if (item.chars.first != '/') - str << '/' if (item.chars.last != '/') -%> -exclude <%= str -%> -<% end %> - -# The include_file and exclude_file parameters, if enabled, simply get -# passed directly to rsync. Please look up the --include-from and -# --exclude-from options in the rsync man page for more details. -# -#include_file /path/to/include/file -#exclude_file /path/to/exclude/file - -# If your version of rsync supports --link-dest, consider enabling this. -# This is the best way to support special files (FIFOs, etc) cross-platform. -# The default is 0 (off). -# -#link_dest 0 - -# When sync_first is enabled, it changes the default behaviour of rsnapshot. -# Normally, when rsnapshot is called with its lowest interval -# (i.e.: "rsnapshot alpha"), it will sync files AND rotate the lowest -# intervals. With sync_first enabled, "rsnapshot sync" handles the file sync, -# and all interval calls simply rotate files. See the man page for more -# details. The default is 0 (off). -# -#sync_first 0 - -# If enabled, rsnapshot will move the oldest directory for each interval -# to [interval_name].delete, then it will remove the lockfile and delete -# that directory just before it exits. The default is 0 (off). -# -#use_lazy_deletes 0 - -# Number of rsync re-tries. If you experience any network problems or -# network card issues that tend to cause ssh to fail with errors like -# "Corrupted MAC on input", for example, set this to a non-zero value -# to have the rsync operation re-tried. -# -#rsync_numtries 0 - -# LVM parameters. Used to backup with creating lvm snapshot before backup -# and removing it after. This should ensure consistency of data in some special -# cases -# -# LVM snapshot(s) size (lvcreate --size option). -# -#linux_lvm_snapshotsize 100M - -# Name to be used when creating the LVM logical volume snapshot(s). -# -#linux_lvm_snapshotname rsnapshot - -# Path to the LVM Volume Groups. -# -#linux_lvm_vgpath /dev - -# Mount point to use to temporarily mount the snapshot(s). -# -#linux_lvm_mountpath /path/to/mount/lvm/snapshot/during/backup - -############################### -### BACKUP POINTS / SCRIPTS ### -############################### - -# LOCALHOST -backup /etc/ banco.softwareheritage.org/ -backup /home/ banco.softwareheritage.org/ -backup /root/ banco.softwareheritage.org/ -#backup /var/log/rsnapshot localhost/ -#backup /etc/passwd localhost/ -#backup /home/foo/My Documents/ localhost/ -#backup /foo/bar/ localhost/ one_fs=1, rsync_short_args=-urltvpog -#backup_script /usr/local/bin/backup_pgsql.sh localhost/postgres/ -# You must set linux_lvm_* parameters below before using lvm snapshots -#backup lvm://vg0/xen-home/ lvm-vg0/xen-home/ - -# EXAMPLE.COM -#backup_exec /bin/date "+ backup of example.com started at %c" -#backup root@example.com:/home/ example.com/ +rsync_long_args=--bwlimit=16,exclude=core -#backup root@example.com:/etc/ example.com/ exclude=mtab,exclude=core -#backup_exec ssh root@example.com "mysqldump -A > /var/db/dump/mysql.sql" -#backup root@example.com:/var/db/dump/ example.com/ -#backup_exec /bin/date "+ backup of example.com ended at %c" - -# CVS.SOURCEFORGE.NET -#backup_script /usr/local/bin/backup_rsnapshot_cvsroot.sh rsnapshot.cvs.sourceforge.net/ - -# RSYNC.SAMBA.ORG -#backup rsync://rsync.samba.org/rsyncftp/ rsync.samba.org/rsyncftp/ - diff --git a/site-modules/role/manifests/swh_backup.pp b/site-modules/role/manifests/swh_backup.pp index 2262e553..15a978c9 100644 --- a/site-modules/role/manifests/swh_backup.pp +++ b/site-modules/role/manifests/swh_backup.pp @@ -1,7 +1,6 @@ class role::swh_backup inherits role::swh_server { include profile::puppet::agent include profile::swh::deploy::objstorage include profile::swh::deploy::objstorage_ceph include profile::megacli - include profile::rsnapshot::master }