Merge branch 'tails-17728_use-check-mirrors-repo-from-GitLab'

manifests/base.pp

@@ -194,6 +194,12 @@ class tails::base (
     key    => 'AAAAB3NzaC1yc2EAAAADAQABAAABAQDWZOi/+y7UnMqWyUtQhUCPt6aCt5NzfTPcxS/8AuP00xNKQsPiKRXId2DDYuBf2bp3pDOoxS+S8t1WKJZ7EBoGESYmq5FEx4mSEoK3c+rMv/Phs9phMoOi0xpzn+KpEYBqSo/xzgX35eANTrcnIGx/XwA2QSSehOQPUgAraaQiAEXcNCnDR1M8z6o/JYXXrM2974Uk51082uv+vaxDWpuhw19C6Ytq7P2HRxkRqwu/af8Tn02dea9QjVQ4AJXQNhla2BJrZPEjR4r0fpUjycD0wY4SO/QiLdZNdD21ZayJder96ktsxYbqh219snQsqoMkk60DmCc3dANPgeGHSmJj', # lint:ignore:140chars -- SSH key
   }
 
+  sshkey { 'gitlab-ssh.tails.boum.org':
+    ensure => present,
+    type   => 'ecdsa-sha2-nistp256',
+    key    => 'AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBM4AzdtxoBR9EaIOR9yNxeQbdiNdHcqfKUtWP5d46YUer4XAzVxg3x33srMdfk2SNyYP/YllEmm7/+O3yRmBUs4=', # lint:ignore:140chars -- SSH key
+  }
+
   #
   # Miscellaneous settings
   #

manifests/check_mirrors.pp

 # Manage checking of Tails mirrors
 class tails::check_mirrors (
   String $email_recipient,
-  Stdlib::Absolutepath $homedir      = '/var/lib/tails_check_mirrors',
-  Pattern[/\A[a-z_]+\z/] $user       = 'tails_check_mirrors',
-  Pattern[/\A[a-z_]+\z/] $repo_user  = 'tails',
-  Stdlib::Host $repo_host            = 'git.tails.boum.org',
-  Pattern[/\A[a-z_-]+\z/] $repo_name = 'check-mirrors',
-  String $repo_rev                   = 'master',
-  String $repo_ensure                = 'latest',
+  Stdlib::Absolutepath $homedir        = '/var/lib/tails_check_mirrors',
+  Pattern[/\A[a-z_]+\z/] $user         = 'tails_check_mirrors',
+  Pattern[/\A[a-z_]+\z/] $repo_user    = 'git',
+  Stdlib::Host $repo_host              = 'gitlab-ssh.tails.boum.org',
+  Pattern[/\A[a-z\/_-]+\z/] $repo_name = 'tails/check-mirrors',
+  String $repo_rev                     = 'master',
+  String $repo_ensure                  = 'latest',
 ) {
 
   validate_email_address($email_recipient)