diff options
| author | Nicolas Vigier <boklm@mageia.org> | 2013-04-14 13:46:12 +0000 |
|---|---|---|
| committer | Nicolas Vigier <boklm@mageia.org> | 2013-04-14 13:46:12 +0000 |
| commit | 1be510f9529cb082f802408b472a77d074b394c0 (patch) | |
| tree | b175f9d5fcb107576dabc768e7bd04d4a3e491a0 /zarb-ml/mageia-sysadm/attachments/20110720 | |
| parent | fa5098cf210b23ab4f419913e28af7b1b07dafb2 (diff) | |
| download | archives-master.tar archives-master.tar.gz archives-master.tar.bz2 archives-master.tar.xz archives-master.zip | |
Diffstat (limited to 'zarb-ml/mageia-sysadm/attachments/20110720')
4 files changed, 182 insertions, 0 deletions
diff --git a/zarb-ml/mageia-sysadm/attachments/20110720/e82dc775/attachment-0001.obj b/zarb-ml/mageia-sysadm/attachments/20110720/e82dc775/attachment-0001.obj new file mode 100644 index 000000000..31bb65c11 --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20110720/e82dc775/attachment-0001.obj @@ -0,0 +1,65 @@ +Index: deployment/common/manifests/init.pp +=================================================================== +--- deployment/common/manifests/init.pp (révision 1879) ++++ deployment/common/manifests/init.pp (copie de travail) +@@ -88,7 +88,6 @@ + } + + class default_mageia_server_no_smtp { +- include timezone + + include shadow + include openssh::server +Index: modules/ntp/manifests/init.pp +=================================================================== +--- modules/ntp/manifests/init.pp (révision 1879) ++++ modules/ntp/manifests/init.pp (copie de travail) +@@ -7,11 +7,10 @@ + service { ntpd: + ensure => running, + path => "/etc/init.d/ntpd", +- subscribe => [ Package["ntp"], File["ntp.conf"] ] ++ subscribe => [ Package["ntp"], File["/etc/ntp.conf"] ] + } + +- file { "ntp.conf": +- path => "/etc/ntp.conf", ++ file { "/etc/ntp.conf": + ensure => present, + owner => root, + group => root, +Index: modules/puppet/manifests/init.pp +=================================================================== +--- modules/puppet/manifests/init.pp (révision 1879) ++++ modules/puppet/manifests/init.pp (copie de travail) +@@ -5,8 +5,7 @@ + ensure => installed + } + +- file { "puppet.conf": +- path => "/etc/puppet/puppet.conf", ++ file { "/etc/puppet/puppet.conf": + ensure => present, + owner => root, + group => root, +@@ -36,7 +35,7 @@ + service { puppetmaster: + ensure => running, + path => "/etc/init.d/puppetmaster", +- subscribe => [ Package[puppet-server], File["puppet.conf"]] ++ subscribe => [ Package[puppet-server], File["/etc/puppet/puppet.conf"]] + } + + file { "extdata": +Index: manifests/nodes.pp +=================================================================== +--- manifests/nodes.pp (révision 1879) ++++ manifests/nodes.pp (copie de travail) +@@ -156,6 +156,7 @@ + # - install the server in datacenter + # - install a backup system + include common::default_mageia_server ++ timezone::timezone { "Europe/Paris": } + } + + # gandi-vm
\ No newline at end of file diff --git a/zarb-ml/mageia-sysadm/attachments/20110720/e82dc775/attachment.obj b/zarb-ml/mageia-sysadm/attachments/20110720/e82dc775/attachment.obj new file mode 100644 index 000000000..31bb65c11 --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20110720/e82dc775/attachment.obj @@ -0,0 +1,65 @@ +Index: deployment/common/manifests/init.pp +=================================================================== +--- deployment/common/manifests/init.pp (révision 1879) ++++ deployment/common/manifests/init.pp (copie de travail) +@@ -88,7 +88,6 @@ + } + + class default_mageia_server_no_smtp { +- include timezone + + include shadow + include openssh::server +Index: modules/ntp/manifests/init.pp +=================================================================== +--- modules/ntp/manifests/init.pp (révision 1879) ++++ modules/ntp/manifests/init.pp (copie de travail) +@@ -7,11 +7,10 @@ + service { ntpd: + ensure => running, + path => "/etc/init.d/ntpd", +- subscribe => [ Package["ntp"], File["ntp.conf"] ] ++ subscribe => [ Package["ntp"], File["/etc/ntp.conf"] ] + } + +- file { "ntp.conf": +- path => "/etc/ntp.conf", ++ file { "/etc/ntp.conf": + ensure => present, + owner => root, + group => root, +Index: modules/puppet/manifests/init.pp +=================================================================== +--- modules/puppet/manifests/init.pp (révision 1879) ++++ modules/puppet/manifests/init.pp (copie de travail) +@@ -5,8 +5,7 @@ + ensure => installed + } + +- file { "puppet.conf": +- path => "/etc/puppet/puppet.conf", ++ file { "/etc/puppet/puppet.conf": + ensure => present, + owner => root, + group => root, +@@ -36,7 +35,7 @@ + service { puppetmaster: + ensure => running, + path => "/etc/init.d/puppetmaster", +- subscribe => [ Package[puppet-server], File["puppet.conf"]] ++ subscribe => [ Package[puppet-server], File["/etc/puppet/puppet.conf"]] + } + + file { "extdata": +Index: manifests/nodes.pp +=================================================================== +--- manifests/nodes.pp (révision 1879) ++++ manifests/nodes.pp (copie de travail) +@@ -156,6 +156,7 @@ + # - install the server in datacenter + # - install a backup system + include common::default_mageia_server ++ timezone::timezone { "Europe/Paris": } + } + + # gandi-vm
\ No newline at end of file diff --git a/zarb-ml/mageia-sysadm/attachments/20110720/eef0cd24/attachment-0001.bin b/zarb-ml/mageia-sysadm/attachments/20110720/eef0cd24/attachment-0001.bin new file mode 100644 index 000000000..d820066c4 --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20110720/eef0cd24/attachment-0001.bin @@ -0,0 +1,26 @@ +#!/bin/sh + +if [ $# != 4 ] +then + echo 'Usage: mga-move-update distrorelease section srcname bugnumber' >&2 + exit 1 +fi + +distrorelease="$1" +section="$2" +srcname="$3" +bugnumber="$4" + +mga-move-update "$1" "$2" "$3" + +export SIG="https://bugs.mageia.org/show_bug.cgi?id=$4" + +mutt -e 'set from="Mageia Updates <buildsystem-daemon@mageia.org>"' \ + -e 'set signature="( echo ; echo $SIG)|"' \ + -e 'set sig_dashes=no' \ + -e 'set autoedit=yes' \ + -e 'set edit_headers=yes' \ + updates-announce@ml.mageia.org -s "Package update: $3 ($2)" + +# TODO close the bug automatically with web api : +# http://www.bugzilla.org/docs/tip/en/html/api/Bugzilla/WebService/Bug.html#update diff --git a/zarb-ml/mageia-sysadm/attachments/20110720/eef0cd24/attachment.bin b/zarb-ml/mageia-sysadm/attachments/20110720/eef0cd24/attachment.bin new file mode 100644 index 000000000..d820066c4 --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20110720/eef0cd24/attachment.bin @@ -0,0 +1,26 @@ +#!/bin/sh + +if [ $# != 4 ] +then + echo 'Usage: mga-move-update distrorelease section srcname bugnumber' >&2 + exit 1 +fi + +distrorelease="$1" +section="$2" +srcname="$3" +bugnumber="$4" + +mga-move-update "$1" "$2" "$3" + +export SIG="https://bugs.mageia.org/show_bug.cgi?id=$4" + +mutt -e 'set from="Mageia Updates <buildsystem-daemon@mageia.org>"' \ + -e 'set signature="( echo ; echo $SIG)|"' \ + -e 'set sig_dashes=no' \ + -e 'set autoedit=yes' \ + -e 'set edit_headers=yes' \ + updates-announce@ml.mageia.org -s "Package update: $3 ($2)" + +# TODO close the bug automatically with web api : +# http://www.bugzilla.org/docs/tip/en/html/api/Bugzilla/WebService/Bug.html#update |