From buildbot at linuxbase.org  Sat Jul 15 12:24:31 2017
From: buildbot at linuxbase.org (buildbot at linuxbase.org)
Date: Sat, 15 Jul 2017 05:24:31 -0700
Subject: [Lsb-messages] buildbot retry in LSB on lsb-xvfb-x86
Message-ID: <20170715122432.9AFAC124E24@lsb2.linux-foundation.org>

 on builder lsb-xvfb-x86 while building LSB.
Full details are available at:
 http://www.linuxbase.org/buildbot/builders/lsb-xvfb-x86/builds/154

Buildbot URL: http://www.linuxbase.org/buildbot/

Buildslave for this Build: lfbuild-x86

Build Reason: MultiScheduler job
Build Source Stamp: [branch lsb/devel/lsb-xvfb] -1
Blamelist: 

BUILD FAILED: retry exception slave lost

sincerely,
 -The Buildbot




From buildbot at linuxbase.org  Sat Jul 15 15:11:32 2017
From: buildbot at linuxbase.org (buildbot at linuxbase.org)
Date: Sat, 15 Jul 2017 08:11:32 -0700
Subject: [Lsb-messages] buildbot success in LSB on lsb-xvfb-x86
Message-ID: <20170715151132.86877124F26@lsb2.linux-foundation.org>

The Buildbot has detected a restored build on builder lsb-xvfb-x86 while building LSB.
Full details are available at:
 http://www.linuxbase.org/buildbot/builders/lsb-xvfb-x86/builds/155

Buildbot URL: http://www.linuxbase.org/buildbot/

Buildslave for this Build: lfbuild-x86

Build Reason: MultiScheduler job
Build Source Stamp: [branch lsb/devel/lsb-xvfb] -1
Blamelist: 

Build succeeded!

sincerely,
 -The Buildbot




From licquia at linuxfoundation.org  Wed Jul 26 14:50:01 2017
From: licquia at linuxfoundation.org (Jeff Licquia)
Date: Wed, 26 Jul 2017 10:50:01 -0400
Subject: [Lsb-messages] /var/www/bzr/lsb/devel/puppet-lsb r710: Add HTTPS
	for files/ftp sites.
Message-ID: <20170726145004.33160EBCAC@scm.linux-foundation.org>

------------------------------------------------------------
revno: 710
committer: Jeff Licquia <licquia at linuxfoundation.org
branch nick: puppet-lsb
timestamp: Wed 2017-07-26 10:50:01 -0400
message:
  Add HTTPS for files/ftp sites.
modified:
  modules/apachehttpd/files/vhosts.d/lsb2.linux-foundation.org/files.conf
-------------- next part --------------
=== modified file 'modules/apachehttpd/files/vhosts.d/lsb2.linux-foundation.org/files.conf'
--- a/modules/apachehttpd/files/vhosts.d/lsb2.linux-foundation.org/files.conf	2015-03-27 14:01:21 +0000
+++ b/modules/apachehttpd/files/vhosts.d/lsb2.linux-foundation.org/files.conf	2017-07-26 14:50:01 +0000
@@ -129,3 +129,130 @@
 
 </VirtualHost>
 
+<VirtualHost *:443>
+    ServerAdmin webmaster at linuxbase.org
+    ServerName files.linuxbase.org
+    ServerAlias ftp.linuxbase.org
+    ServerAlias ftp.linuxfoundation.org
+    ServerAlias ftp.linux-foundation.org
+
+    # DocumentRoot: The directory out of which you will serve your
+    # documents. By default, all requests are taken from this directory, but
+    # symbolic links and aliases may be used to point to other locations.
+    DocumentRoot /data/ftp
+
+    # if not specified, the global error log is used
+    ErrorLog /var/log/apache2/files.linuxbase.org-error_log
+    CustomLog /var/log/apache2/files.linuxbase.org-access_log combined
+
+    # don't loose time with IP address lookups
+    HostnameLookups Off
+
+    # needed for named virtual hosts
+    UseCanonicalName Off
+
+    # configures the footer on server-generated documents
+    ServerSignature On
+
+    # be sure to disable PHP on this vhost
+    php_admin_flag engine off
+
+    # Optionally, include *.conf files from /etc/apache2/conf.d/
+    #
+    # For example, to allow execution of PHP scripts:
+    #
+    # Include /etc/apache2/conf.d/mod_php4.conf
+    #
+    # or, to include all configuration snippets added by packages:
+    # Include /etc/apache2/conf.d/*.conf
+
+
+    # ScriptAlias: This controls which directories contain server scripts.
+    # ScriptAliases are essentially the same as Aliases, except that
+    # documents in the realname directory are treated as applications and
+    # run by the server when requested rather than as documents sent to the client.
+    # The same rules about trailing "/" apply to ScriptAlias directives as to
+    # Alias.
+    #
+    #ScriptAlias /cgi-bin/ "/srv/www/vhosts/files.linuxbase.org/cgi-bin/"
+
+    # "/srv/www/cgi-bin" should be changed to whatever your ScriptAliased
+    # CGI directory exists, if you have one, and where ScriptAlias points to.
+    #
+    #<Directory "/srv/www/vhosts/files.linuxbase.org/cgi-bin">
+#	AllowOverride None
+#	Options +ExecCGI -Includes
+#	Order allow,deny
+#	Allow from all
+#    </Directory>
+
+
+    # UserDir: The name of the directory that is appended onto a user's home
+    # directory if a ~user request is received.
+    #
+    # To disable it, simply remove userdir from the list of modules in APACHE_MODULES
+    # in /etc/sysconfig/apache2.
+    #
+    #<IfModule mod_userdir.c>
+	# Note that the name of the user directory ("public_html") cannot simply be
+	# changed here, since it is a compile time setting. The apache package
+	# would have to be rebuilt. You could work around by deleting
+	# /usr/sbin/suexec, but then all scripts from the directories would be
+	# executed with the UID of the webserver.
+	#UserDir public_html
+	# The actual configuration of the directory is in
+	# /etc/apache2/mod_userdir.conf.
+	#Include /etc/apache2/mod_userdir.conf
+	# You can, however, change the ~ if you find it awkward, by mapping e.g.
+	# http://www.example.com/users/karl-heinz/ --> /home/karl-heinz/public_html/
+	#AliasMatch ^/users/([a-zA-Z0-9-_.]*)/?(.*) /home/$1/public_html/$2
+    #</IfModule>
+
+
+    #
+    # This should be changed to whatever you set DocumentRoot to.
+    #
+    <Directory "/data/ftp">
+    
+	#
+	# Possible values for the Options directive are "None", "All",
+	# or any combination of:
+	#   Indexes Includes FollowSymLinks SymLinksifOwnerMatch ExecCGI MultiViews
+	#
+	# Note that "MultiViews" must be named *explicitly* --- "Options All"
+	# doesn't give it to you.
+	#
+	# The Options directive is both complicated and important.  Please see
+	# http://httpd.apache.org/docs-2.2/mod/core.html#options
+	# for more information.
+	#
+	Options Indexes FollowSymLinks
+    
+	#
+	# AllowOverride controls what directives may be placed in .htaccess files.
+	# It can be "All", "None", or any combination of the keywords:
+	#   Options FileInfo AuthConfig Limit
+	#
+	AllowOverride None
+    
+	#
+	# Controls who can get stuff from this server.
+	#
+	Order allow,deny
+	Allow from all
+
+	IndexOptions Charset=UTF-8
+    </Directory>
+
+	SSLEngine on
+	SSLProtocol all -SSLv2 -SSLv3
+	SSLCipherSuite ALL:!aNULL:!eNULL:!SSLv2:!LOW:!EXP:!MD5:@STRENGTH
+
+	SSLCertificateFile /etc/letsencrypt/live/files.linuxbase.org/fullchain.pem
+	SSLCertificateKeyFile /etc/letsencrypt/live/files.linuxbase.org/privkey.pem
+	SSLCertificateChainFile /etc/letsencrypt/live/files.linuxbase.org/fullchain.pem
+
+	<Files ~ "\.(cgi|shtml|phtml|php3?)$">
+	    SSLOptions +StdEnvVars
+	</Files>
+</VirtualHost>


From licquia at linuxfoundation.org  Wed Jul 26 16:27:01 2017
From: licquia at linuxfoundation.org (Jeff Licquia)
Date: Wed, 26 Jul 2017 12:27:01 -0400
Subject: [Lsb-messages] /var/www/bzr/lsb/devel/puppet-lsb r711: Disable RC4
	on HTTPS.
Message-ID: <20170726163003.262ADEBCAC@scm.linux-foundation.org>

------------------------------------------------------------
revno: 711
committer: Jeff Licquia <licquia at linuxfoundation.org
branch nick: puppet-lsb
timestamp: Wed 2017-07-26 12:27:01 -0400
message:
  Disable RC4 on HTTPS.
modified:
  modules/apachehttpd/files/vhosts.d/lsb2.linux-foundation.org/000-default.conf
  modules/apachehttpd/files/vhosts.d/lsb2.linux-foundation.org/files.conf
-------------- next part --------------
=== modified file 'modules/apachehttpd/files/vhosts.d/lsb2.linux-foundation.org/000-default.conf'
--- a/modules/apachehttpd/files/vhosts.d/lsb2.linux-foundation.org/000-default.conf	2017-06-28 15:23:21 +0000
+++ b/modules/apachehttpd/files/vhosts.d/lsb2.linux-foundation.org/000-default.conf	2017-07-26 16:27:01 +0000
@@ -280,7 +280,7 @@
 	# For more information, please have a look at
 	# /usr/share/doc/packages/openssl/README-FIPS.txt from the openssl
 	# package.
-	SSLCipherSuite ALL:!aNULL:!eNULL:!SSLv2:!LOW:!EXP:!MD5:@STRENGTH
+	SSLCipherSuite ALL:!aNULL:!eNULL:!SSLv2:!RC4:!LOW:!EXP:!MD5:@STRENGTH
 
 	#   Server Certificate:
 	#   Point SSLCertificateFile at a PEM encoded certificate.  If

=== modified file 'modules/apachehttpd/files/vhosts.d/lsb2.linux-foundation.org/files.conf'
--- a/modules/apachehttpd/files/vhosts.d/lsb2.linux-foundation.org/files.conf	2017-07-26 14:50:01 +0000
+++ b/modules/apachehttpd/files/vhosts.d/lsb2.linux-foundation.org/files.conf	2017-07-26 16:27:01 +0000
@@ -246,7 +246,7 @@
 
 	SSLEngine on
 	SSLProtocol all -SSLv2 -SSLv3
-	SSLCipherSuite ALL:!aNULL:!eNULL:!SSLv2:!LOW:!EXP:!MD5:@STRENGTH
+	SSLCipherSuite ALL:!aNULL:!eNULL:!SSLv2:!RC4:!LOW:!EXP:!MD5:@STRENGTH
 
 	SSLCertificateFile /etc/letsencrypt/live/files.linuxbase.org/fullchain.pem
 	SSLCertificateKeyFile /etc/letsencrypt/live/files.linuxbase.org/privkey.pem


From licquia at linuxfoundation.org  Thu Jul 27 04:09:13 2017
From: licquia at linuxfoundation.org (Jeff Licquia)
Date: Thu, 27 Jul 2017 00:09:13 -0400
Subject: [Lsb-messages] /var/www/bzr/lsb/devel/puppet-lsb r712: Set up
 certbot and do renewals regularly.
Message-ID: <20170727041003.7BFA3EBCAC@scm.linux-foundation.org>

------------------------------------------------------------
revno: 712
committer: Jeff Licquia <licquia at linuxfoundation.org
branch nick: puppet-lsb
timestamp: Thu 2017-07-27 00:09:13 -0400
message:
  Set up certbot and do renewals regularly.
removed:
  modules/apachehttpd/manifests/ssl.pp
added:
  modules/apachehttpd/manifests/certbot.pp
  modules/miscpkgs/
  modules/miscpkgs/manifests/
  modules/miscpkgs/manifests/wget.pp
modified:
  manifests/nodes/lsb2.pp
  modules/buildbot/manifests/slave.pp
-------------- next part --------------
=== modified file 'manifests/nodes/lsb2.pp'
--- a/manifests/nodes/lsb2.pp	2017-04-07 14:18:52 +0000
+++ b/manifests/nodes/lsb2.pp	2017-07-27 04:09:13 +0000
@@ -13,7 +13,7 @@
     include mail::linuxbase
 
     include apachehttpd, apachehttpd::vhosts, apachehttpd::betaspecs,
-            apachehttpd::modules, apachehttpd::ssl, apachehttpd::linuxbase
+            apachehttpd::modules, apachehttpd::linuxbase, apachehttpd::certbot
 
     include apachehttpd::qa
 

=== added file 'modules/apachehttpd/manifests/certbot.pp'
--- a/modules/apachehttpd/manifests/certbot.pp	1970-01-01 00:00:00 +0000
+++ b/modules/apachehttpd/manifests/certbot.pp	2017-07-27 04:09:13 +0000
@@ -0,0 +1,19 @@
+class apachehttpd::certbot {
+
+    include miscpkgs::wget
+
+    exec { "get-certbot-auto":
+        command => "/usr/bin/wget -O /usr/local/sbin/certbot-auto https://dl.eff.org/certbot-auto && chmod +x /usr/local/sbin/certbot-auto",
+        creates => "/usr/local/sbin/certbot-auto",
+        require => Package["wget"],
+    }
+
+    cron { "refresh-certbot":
+        command => "/usr/local/sbin/certbot-auto -n renew",
+        user    => "root",
+        hour    => 15,
+        minute  => 38,
+        weekday => 4,
+    }
+
+}

=== removed file 'modules/apachehttpd/manifests/ssl.pp'
--- a/modules/apachehttpd/manifests/ssl.pp	2014-04-10 14:34:56 +0000
+++ b/modules/apachehttpd/manifests/ssl.pp	1970-01-01 00:00:00 +0000
@@ -1,16 +0,0 @@
-class apachehttpd::ssl {
-
-    include tls
-
-    file { '/etc/apache2/ssl.crt/linuxbase-sf_bundle.pem':
-        content => "${tls::cert}${tls::sf_bundle_g2}",
-    }
-
-    file { '/etc/apache2/ssl.key/linuxbase.key':
-        content => $tls::key,
-        mode    => 0600,
-        owner   => 'root',
-        group   => 'root',
-    }
-
-}

=== modified file 'modules/buildbot/manifests/slave.pp'
--- a/modules/buildbot/manifests/slave.pp	2017-05-19 14:36:12 +0000
+++ b/modules/buildbot/manifests/slave.pp	2017-07-27 04:09:13 +0000
@@ -1,5 +1,6 @@
 class buildbot::slave inherits buildbot {
 
+    include miscpkgs::wget
     include buildbot::virtualenv
 
     # Security precaution; we should protect all slaves this way.
@@ -238,12 +239,6 @@
         require => Exec['download-lsbappchk-python'],
     }
 
-    # Other packages needed by this puppet module.
-
-    package { 'wget':
-        ensure => present,
-    }
-
     # Set up the base infrastructure.    
 
     file { '/opt/buildbot/.cvspass':

=== added directory 'modules/miscpkgs'
=== added directory 'modules/miscpkgs/manifests'
=== added file 'modules/miscpkgs/manifests/wget.pp'
--- a/modules/miscpkgs/manifests/wget.pp	1970-01-01 00:00:00 +0000
+++ b/modules/miscpkgs/manifests/wget.pp	2017-07-27 04:09:13 +0000
@@ -0,0 +1,7 @@
+class miscpkgs::wget {
+
+    package { 'wget':
+        ensure => present,
+    }
+
+}


From licquia at linuxfoundation.org  Thu Jul 27 04:23:23 2017
From: licquia at linuxfoundation.org (Jeff Licquia)
Date: Thu, 27 Jul 2017 00:23:23 -0400
Subject: [Lsb-messages] /var/www/bzr/lsb/devel/puppet-lsb r713: Don't try to
	update sudo from puppet.
Message-ID: <20170727042502.B56C1EBCAC@scm.linux-foundation.org>

------------------------------------------------------------
revno: 713
committer: Jeff Licquia <licquia at linuxfoundation.org
branch nick: puppet-lsb
timestamp: Thu 2017-07-27 00:23:23 -0400
message:
  Don't try to update sudo from puppet.
  
  This is currently causing issues on lsb2.
modified:
  modules/sudo/manifests/init.pp
-------------- next part --------------
=== modified file 'modules/sudo/manifests/init.pp'
--- a/modules/sudo/manifests/init.pp	2016-09-14 19:27:08 +0000
+++ b/modules/sudo/manifests/init.pp	2017-07-27 04:23:23 +0000
@@ -11,7 +11,7 @@
         /^OpenSuSE/                         => 'default-opensuse',
     }
 
-    package { sudo: ensure => latest }
+    package { sudo: ensure => present }
 
     file { "/etc/sudoers":
         owner   => root,


From licquia at linuxfoundation.org  Fri Jul 28 17:02:25 2017
From: licquia at linuxfoundation.org (Jeff Licquia)
Date: Fri, 28 Jul 2017 13:02:25 -0400
Subject: [Lsb-messages] /var/www/bzr/lsb/devel/puppet-lsb r714: Make certbot
 cron quieter when nothing happens.
Message-ID: <20170728170502.D0423EBCAC@scm.linux-foundation.org>

------------------------------------------------------------
revno: 714
committer: Jeff Licquia <licquia at linuxfoundation.org
branch nick: puppet-lsb
timestamp: Fri 2017-07-28 13:02:25 -0400
message:
  Make certbot cron quieter when nothing happens.
modified:
  modules/apachehttpd/manifests/certbot.pp
-------------- next part --------------
=== modified file 'modules/apachehttpd/manifests/certbot.pp'
--- a/modules/apachehttpd/manifests/certbot.pp	2017-07-27 04:09:13 +0000
+++ b/modules/apachehttpd/manifests/certbot.pp	2017-07-28 17:02:25 +0000
@@ -9,7 +9,7 @@
     }
 
     cron { "refresh-certbot":
-        command => "/usr/local/sbin/certbot-auto -n renew",
+        command => "/usr/local/sbin/certbot-auto renew -n --quiet",
         user    => "root",
         hour    => 15,
         minute  => 38,