summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--contrib/README.md9
-rw-r--r--contrib/commit-template.txt7
-rw-r--r--contrib/offlineimaprc.example.org (renamed from vagrant/offlineimaprc.example.org)0
-rw-r--r--puppet/modules/clamav/manifests/daemon.pp22
-rw-r--r--puppet/modules/clamav/manifests/freshclam.pp10
-rw-r--r--puppet/modules/clamav/manifests/milter.pp6
-rw-r--r--puppet/modules/clamav/manifests/unofficial_sigs.pp5
m---------puppet/modules/couchdb0
m---------puppet/modules/ruby0
-rw-r--r--puppet/modules/site_static/manifests/init.pp2
-rw-r--r--puppet/modules/site_static/templates/apache.conf.erb2
11 files changed, 44 insertions, 19 deletions
diff --git a/contrib/README.md b/contrib/README.md
new file mode 100644
index 00000000..e836bc7e
--- /dev/null
+++ b/contrib/README.md
@@ -0,0 +1,9 @@
+# Contributed Files
+
+## Commit Template
+
+to install this commit template, use following cmd (use --global to use it in your global .gitconfig):
+
+ git config [--global] commit.template "~/path_to_leap_platform/contrib/commit-template.txt"
+
+
diff --git a/contrib/commit-template.txt b/contrib/commit-template.txt
new file mode 100644
index 00000000..9a1fa81b
--- /dev/null
+++ b/contrib/commit-template.txt
@@ -0,0 +1,7 @@
+#[bug|feat|docs|style|refactor|test|pkg|i18n]
+
+#- Tested: [local singlenode|local multinode|citest|unstable.bitmask.net]
+#- Resolves: #XYZ
+#- Related: #XYZ
+#- Documentation: #XYZ
+#- Releases: XYZ
diff --git a/vagrant/offlineimaprc.example.org b/contrib/offlineimaprc.example.org
index 3d119634..3d119634 100644
--- a/vagrant/offlineimaprc.example.org
+++ b/contrib/offlineimaprc.example.org
diff --git a/puppet/modules/clamav/manifests/daemon.pp b/puppet/modules/clamav/manifests/daemon.pp
index 9aebf9b0..bf232e2c 100644
--- a/puppet/modules/clamav/manifests/daemon.pp
+++ b/puppet/modules/clamav/manifests/daemon.pp
@@ -14,20 +14,23 @@ class clamav::daemon {
pattern => '/usr/sbin/clamd',
enable => true,
hasrestart => true,
- subscribe => File['/etc/default/clamav-daemon'];
+ subscribe => File['/etc/default/clamav-daemon'],
+ require => Package['clamav-daemon'];
}
file {
'/var/run/clamav':
- ensure => directory,
- mode => '0750',
- owner => clamav,
- group => postfix;
+ ensure => directory,
+ mode => '0750',
+ owner => clamav,
+ group => postfix,
+ require => [Package['postfix'], Package['clamav-daemon']];
'/var/lib/clamav':
- mode => '0755',
- owner => clamav,
- group => clamav;
+ mode => '0755',
+ owner => clamav,
+ group => clamav,
+ require => Package['clamav-daemon'];
'/etc/default/clamav-daemon':
source => 'puppet:///modules/clamav/clamav-daemon_default',
@@ -41,7 +44,8 @@ class clamav::daemon {
content => template('clamav/local.pdb.erb'),
mode => '0644',
owner => clamav,
- group => clamav;
+ group => clamav,
+ require => Package['clamav-daemon'];
}
file_line {
diff --git a/puppet/modules/clamav/manifests/freshclam.pp b/puppet/modules/clamav/manifests/freshclam.pp
index b9827ede..80c822a4 100644
--- a/puppet/modules/clamav/manifests/freshclam.pp
+++ b/puppet/modules/clamav/manifests/freshclam.pp
@@ -8,14 +8,16 @@ class clamav::freshclam {
enable => true,
name => clamav-freshclam,
pattern => '/usr/bin/freshclam',
- hasrestart => true;
+ hasrestart => true,
+ require => Package['clamav-freshclam'];
}
file_line {
'freshclam_notify':
- path => '/etc/clamav/freshclam.conf',
- line => 'NotifyClamd /etc/clamav/clamd.conf',
- notify => Service[freshclam];
+ path => '/etc/clamav/freshclam.conf',
+ line => 'NotifyClamd /etc/clamav/clamd.conf',
+ require => Package['clamav-freshclam'],
+ notify => Service['freshclam'];
}
}
diff --git a/puppet/modules/clamav/manifests/milter.pp b/puppet/modules/clamav/manifests/milter.pp
index 52ddaef1..e8a85e3f 100644
--- a/puppet/modules/clamav/manifests/milter.pp
+++ b/puppet/modules/clamav/manifests/milter.pp
@@ -14,6 +14,7 @@ class clamav::milter {
name => clamav-milter,
pattern => '/usr/sbin/clamav-milter',
hasrestart => true,
+ require => Package['clamav-milter'],
subscribe => File['/etc/default/clamav-milter'];
}
@@ -29,6 +30,7 @@ class clamav::milter {
mode => '0644',
owner => root,
group => root,
+ require => Package['clamav-milter'],
subscribe => Service['clamav-milter'];
'/etc/default/clamav-milter':
@@ -41,8 +43,8 @@ class clamav::milter {
content => template('clamav/whitelisted_addresses.erb'),
mode => '0644',
owner => root,
- group => root;
-
+ group => root,
+ require => Package['clamav-milter'];
}
}
diff --git a/puppet/modules/clamav/manifests/unofficial_sigs.pp b/puppet/modules/clamav/manifests/unofficial_sigs.pp
index 316154d3..2d849585 100644
--- a/puppet/modules/clamav/manifests/unofficial_sigs.pp
+++ b/puppet/modules/clamav/manifests/unofficial_sigs.pp
@@ -1,10 +1,11 @@
class clamav::unofficial_sigs {
- package { [ 'clamav-unofficial-sigs', 'wget', 'gnupg',
- 'socat', 'rsync', 'curl' ]:
+ package { 'clamav-unofficial-sigs':
ensure => installed
}
+ ensure_packages(['wget', 'gnupg', 'socat', 'rsync', 'curl'])
+
file {
'/var/log/clamav-unofficial-sigs.log':
ensure => file,
diff --git a/puppet/modules/couchdb b/puppet/modules/couchdb
-Subproject ae53b180783016faa4331094a52769ddd57463f
+Subproject cdde1e172b3ed2c6c1f203341e75bcef5c3c349
diff --git a/puppet/modules/ruby b/puppet/modules/ruby
-Subproject e4de25d78eefc7df70a35dee22a3e0dc1b7e1d0
+Subproject 0fb2b398dbfce59c678d6f4044a55969e42c6d4
diff --git a/puppet/modules/site_static/manifests/init.pp b/puppet/modules/site_static/manifests/init.pp
index f69ffba7..8df53075 100644
--- a/puppet/modules/site_static/manifests/init.pp
+++ b/puppet/modules/site_static/manifests/init.pp
@@ -44,7 +44,7 @@ class site_static {
}
if (member($formats, 'amber')) {
- rubygems::gem{'amber-0.3.7':
+ rubygems::gem{'amber-0.3.8':
require => Package['zlib1g-dev']
}
diff --git a/puppet/modules/site_static/templates/apache.conf.erb b/puppet/modules/site_static/templates/apache.conf.erb
index 4d61cc08..2853c5c7 100644
--- a/puppet/modules/site_static/templates/apache.conf.erb
+++ b/puppet/modules/site_static/templates/apache.conf.erb
@@ -48,7 +48,7 @@
Include include.d/ssl_common.inc
<%- if @tls_only -%>
- Header add Strict-Transport-Security: "max-age=15768000;includeSubdomains"
+ Header always set Strict-Transport-Security: "max-age=15768000;includeSubdomains"
<%- end -%>
Header set X-Frame-Options "deny"
Header always unset X-Powered-By
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-02 15:33:50 +0000