From 35e11e3c9b2ce4f7fce2cd68e870cff855d6e065 Mon Sep 17 00:00:00 2001 From: Varac Date: Fri, 25 Aug 2017 10:27:10 +0200 Subject: Remove pixelated config --- files/puppet/modules/custom/manifests/init.pp | 3 --- 1 file changed, 3 deletions(-) (limited to 'files') diff --git a/files/puppet/modules/custom/manifests/init.pp b/files/puppet/modules/custom/manifests/init.pp index 0a67491..bd3f4e3 100644 --- a/files/puppet/modules/custom/manifests/init.pp +++ b/files/puppet/modules/custom/manifests/init.pp @@ -22,7 +22,4 @@ class custom { include custom_munin_node::openvpn } - if member ( $services, 'pixelated') { - include ::pixelated - } } -- cgit v1.2.3 From dc2a70782dcde18a3299281b6a7547e1a58d0e10 Mon Sep 17 00:00:00 2001 From: Varac Date: Sat, 26 Aug 2017 11:15:51 +0200 Subject: Add additional master deb repo to unstable.bitmask.net --- .../custom/manifests/apt/additional_sources.pp | 24 ++++++++++++++++++++++ files/puppet/modules/custom/manifests/init.pp | 7 +++++++ 2 files changed, 31 insertions(+) create mode 100644 files/puppet/modules/custom/manifests/apt/additional_sources.pp (limited to 'files') diff --git a/files/puppet/modules/custom/manifests/apt/additional_sources.pp b/files/puppet/modules/custom/manifests/apt/additional_sources.pp new file mode 100644 index 0000000..029c92d --- /dev/null +++ b/files/puppet/modules/custom/manifests/apt/additional_sources.pp @@ -0,0 +1,24 @@ +# Add additional sources and configure unattended updates for it +define custom::apt::additional_sources ( + $ensure = 'present', + $signed_by = '[signed-by=/usr/share/keyrings/leap-archive.gpg]', + $repodomain = 'deb.leap.se', + $project = 'platform', + $dist = $::lsbdistcodename, + $component = 'master' +){ + + apt::sources_list { "${name}.list": + ensure => $ensure, + content => "deb ${signed_by} http://${repodomain}/${project} ${dist} ${component}", + } + + apt::apt_conf { "52unattended-upgrades-${name}": + content => "Unattended-Upgrade::Origins-Pattern { + \"site=${repodomain},component=${component}\"; +}", + require => Package['unattended-upgrades'], + refresh_apt => false, + } + +} diff --git a/files/puppet/modules/custom/manifests/init.pp b/files/puppet/modules/custom/manifests/init.pp index bd3f4e3..db5dfbb 100644 --- a/files/puppet/modules/custom/manifests/init.pp +++ b/files/puppet/modules/custom/manifests/init.pp @@ -22,4 +22,11 @@ class custom { include custom_munin_node::openvpn } + # Use additional packages from master repo + if $::domain == 'unstable.bitmask.net' { + ::custom::apt::additional_sources {'leap-master': + component => 'master' + } + } + } -- cgit v1.2.3 From 142900149d82132f83cf76492222c70a5ca29887 Mon Sep 17 00:00:00 2001 From: Azul Date: Tue, 5 Sep 2017 19:59:09 +0200 Subject: New cert for dev.bitmask.net and cdev.bitmask.net --- files/cert/cdev.bitmask.net.crt | 20 ++++++++++---------- files/cert/dev.bitmask.net.crt | 20 ++++++++++---------- 2 files changed, 20 insertions(+), 20 deletions(-) (limited to 'files') diff --git a/files/cert/cdev.bitmask.net.crt b/files/cert/cdev.bitmask.net.crt index 5f84c77..07672cf 100644 --- a/files/cert/cdev.bitmask.net.crt +++ b/files/cert/cdev.bitmask.net.crt @@ -1,8 +1,8 @@ -----BEGIN CERTIFICATE----- -MIIGAzCCBOugAwIBAgISA/djPqoqFpoKaCNI9DYpNXaoMA0GCSqGSIb3DQEBCwUA +MIIGAzCCBOugAwIBAgISA8oBJExluR9ZpA4h2Rreorv+MA0GCSqGSIb3DQEBCwUA MEoxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MSMwIQYDVQQD -ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xNzA3MTgxNTAzMDBaFw0x -NzEwMTYxNTAzMDBaMBsxGTAXBgNVBAMTEGNkZXYuYml0bWFzay5uZXQwggIiMA0G +ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xNzA5MDUxNjU4MDBaFw0x +NzEyMDQxNjU4MDBaMBsxGTAXBgNVBAMTEGNkZXYuYml0bWFzay5uZXQwggIiMA0G CSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDOSQHWGCuXnCz/MykBAugtPJUNu855 SPLEmKkKjg7mIsAPKWh9hXXXBi8PsE8GTQcFsjdv86nzLnfDYr0f7+PV8Fs4WxE+ hN8T8derrYM90Fbers9gmzIQORYE+iyXnuPSiGk5XBNTugDvr+fYMfvPf5b092SE @@ -25,13 +25,13 @@ CCsGAQUFBwIBFhpodHRwOi8vY3BzLmxldHNlbmNyeXB0Lm9yZzCBqwYIKwYBBQUH AgIwgZ4MgZtUaGlzIENlcnRpZmljYXRlIG1heSBvbmx5IGJlIHJlbGllZCB1cG9u IGJ5IFJlbHlpbmcgUGFydGllcyBhbmQgb25seSBpbiBhY2NvcmRhbmNlIHdpdGgg dGhlIENlcnRpZmljYXRlIFBvbGljeSBmb3VuZCBhdCBodHRwczovL2xldHNlbmNy -eXB0Lm9yZy9yZXBvc2l0b3J5LzANBgkqhkiG9w0BAQsFAAOCAQEAT2F7qSf81CqV -9EOJGabCU/eAUbhJ0Lm97X+r9q9PRGgk3v0vTaUcUFFJhwW2F0v0KenVfHqWiios -xkQXaeZY38lfcVWqffZSBKdG2xCWRT6lY+5QHLW4gC62qdcev3jmNOAiimMuChR6 -mDHbZZLeO6zhVZNFC2FZ2wWHN/6AjksCI350UtUq9xAiHcRzqTVUiLCuA4hMnueq -Yuqaw0Iv46vTFREnTQcGQQibF9X6Kc6UsZe/GpqHmLKIEclSGb2ytf8i++dSsRxT -Z0R9vTPCrWNYVvvLK8Z4WAojL6gl9T6vUz/n/oYAaVScDK3i+gAxilU3wDXSkdLw -8JNUC/OaCQ== +eXB0Lm9yZy9yZXBvc2l0b3J5LzANBgkqhkiG9w0BAQsFAAOCAQEAjp+83HopTxZ0 +p+QajfKOX+BisroEiTK+/zAQMBtJ85y1cKUmd0x35dmQi5y4MOvXTsUjopIkmy7q +zf0N8ajXi6KfmmEeBJBoFJd9L4KNgX4zJLHYivaSazXK90b3pPCIvHjIeMYXok9M +urrrAsnqXpJinaHdnYpEGWyyLPJ6c0lUH6+jvj0kxHUGX4F7HnFBl7YwKIkPgNID +JfxuZmqvZQ4zflEtfqF8ik/eD6nMR/QpjiLy2P03xnfTZzRvLg6hjAkuRZ7Phgxq +JGsyVjwZ0UH+g/rf4WE/APvfQ2fX9VAwv3I2O59soMYfjNLZQY7iJ3V3kIbSYOYb +7SJkNr55kA== -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- MIIEkjCCA3qgAwIBAgIQCgFBQgAAAVOFc2oLheynCDANBgkqhkiG9w0BAQsFADA/ diff --git a/files/cert/dev.bitmask.net.crt b/files/cert/dev.bitmask.net.crt index 85f0dac..8b6af72 100644 --- a/files/cert/dev.bitmask.net.crt +++ b/files/cert/dev.bitmask.net.crt @@ -1,8 +1,8 @@ -----BEGIN CERTIFICATE----- -MIIGATCCBOmgAwIBAgISA8E1V+o2lFHuS6xcRXbaC8KWMA0GCSqGSIb3DQEBCwUA +MIIGATCCBOmgAwIBAgISA9AnnVkXz8B7kz7mmuL6e2fTMA0GCSqGSIb3DQEBCwUA MEoxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MSMwIQYDVQQD -ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xNzA4MTQwNTUwMDBaFw0x -NzExMTIwNTUwMDBaMBoxGDAWBgNVBAMTD2Rldi5iaXRtYXNrLm5ldDCCAiIwDQYJ +ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xNzA5MDUxNjU4MDBaFw0x +NzEyMDQxNjU4MDBaMBoxGDAWBgNVBAMTD2Rldi5iaXRtYXNrLm5ldDCCAiIwDQYJ KoZIhvcNAQEBBQADggIPADCCAgoCggIBALgKYaWVwXrg2n8ojpff4inIEzU6vP7d PAhal95VtoiQWInTQI4/M39IFd11aF5BUxa/ruZHgc32WloTkNx8DoGuPB1q1yQH ZbEpdxsGQfvDICwQKNLdI0JYTKgIADcG4dsxXG8P6VwwdBp5V+bD8Jorhp30iJL3 @@ -25,13 +25,13 @@ BgEFBQcCARYaaHR0cDovL2Nwcy5sZXRzZW5jcnlwdC5vcmcwgasGCCsGAQUFBwIC MIGeDIGbVGhpcyBDZXJ0aWZpY2F0ZSBtYXkgb25seSBiZSByZWxpZWQgdXBvbiBi eSBSZWx5aW5nIFBhcnRpZXMgYW5kIG9ubHkgaW4gYWNjb3JkYW5jZSB3aXRoIHRo ZSBDZXJ0aWZpY2F0ZSBQb2xpY3kgZm91bmQgYXQgaHR0cHM6Ly9sZXRzZW5jcnlw -dC5vcmcvcmVwb3NpdG9yeS8wDQYJKoZIhvcNAQELBQADggEBAC2oPTL8ohzEFO0A -Na6iuQJf5Z5cUB+heYVmjrH4CPMDuSuvSCtoaLNs4Cn7uSgIWau4ZtmDfcMs/Ypl -VhSUpSgg5On+K2PKLSJv+rk6OQe9hF4j8GB7MnZ2y0OP/GAC9YxDFB2V07Hn8ojz -x1W/onpp0upvu4rLk+Xrxj7aV2EFMH2sKtiX0EzX0isoImW5by3TLd6cOQvyeTp9 -NPQYIYlYuQst6r/WbsvNxTgCB9yTk+OL/DKeFzE6SYRjhnd2qnsXwSbjIwdHt0/Y -vAt9N9z+yapmbG6K85Lb+XtUMbrn8kngicCJqefunurOCxCbn1inA54gGh1HGZC8 -Ts8Dtrc= +dC5vcmcvcmVwb3NpdG9yeS8wDQYJKoZIhvcNAQELBQADggEBAHpB2C1vPzVmS5WJ +7/9uHcfpLH0YlvT10Cqoias2zfHC8vnzQhBEvme1xz5W6/5TT6T7KDcdbZypjrIp +NBUpMS0ZUdySJ0tDgx47N/XTXkoZGEF+LsGJj5LjHMorHU6m9RM2NmnpTxu+V8nX +lGqA/u4IGdMRDy/DvePqr5N6A4XXS3oEUI3nwpTXj3BzvDitf0opeNYTjsEcQJRh +I6nFCLhb8RDbaITJLdG3sOCTJPriDGun0E0RQ2I/LoF+G2gyvfwWnzXKL26oGrdi +569ils8gYoden6FwrXsEy4RJuppZ/Dql60bJDwsSDVBQsibundExJk14GaxQOYZ/ +3ZMSw0c= -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- MIIEkjCCA3qgAwIBAgIQCgFBQgAAAVOFc2oLheynCDANBgkqhkiG9w0BAQsFADA/ -- cgit v1.2.3