--- orchestra-1.7.orig/debian/ubuntu-orchestra-client.config +++ orchestra-1.7/debian/ubuntu-orchestra-client.config @@ -0,0 +1,6 @@ +#!/bin/sh -e +# A simplified version of debconf's own config script. +. /usr/share/debconf/confmodule +# Ask for the rsyslog host +db_input critical ubuntu-orchestra-client/rsyslog_host || true +db_go --- orchestra-1.7.orig/debian/ubuntu-orchestra-provisioning-server.links +++ orchestra-1.7/debian/ubuntu-orchestra-provisioning-server.links @@ -0,0 +1 @@ +usr/share/orchestra/conf/apache_orchestra etc/apache2/sites-available/orchestra-provisioning --- orchestra-1.7.orig/debian/ubuntu-orchestra-provisioning-server.preinst +++ orchestra-1.7/debian/ubuntu-orchestra-provisioning-server.preinst @@ -0,0 +1,23 @@ +#!/bin/sh -e + +if [ -s /etc/hostname ]; then + # hostname file exists, is not empty, read hostname + hostname=$(cat /etc/hostname) + if ! grep -qs "\W$hostname" /etc/hosts; then + # hostname does not exist in /etc/hosts + if grep -qs "127\.0\.1\.1\W" /etc/hosts; then + # 127.0.1.1 exists, so append to line + sed -i "s/\(127\.0\.1\.1.*\)/\1 $hostname/" /etc/hosts + else + # 127.0.1.1 does not exist, so add entire line + echo "127.0.1.1 $hostname" >> /etc/hosts + fi + fi +fi + +# Preseed squid-deb-proxy debconf options +echo squid-deb-proxy squid-deb-proxy/ppa-enable boolean Y | debconf-set-selections +echo squid-deb-proxy squid-deb-proxy/acl-enable boolean N | debconf-set-selections + +#DEBHELPER# +exit 0 --- orchestra-1.7.orig/debian/ubuntu-orchestra-management-server.postinst +++ orchestra-1.7/debian/ubuntu-orchestra-management-server.postinst @@ -0,0 +1,53 @@ +#!/bin/sh -e + +. /usr/share/debconf/confmodule +db_version 2.0 + +if ([ "$1" = "configure" ] && [ -z "$2" ]) || [ "$1" = "reconfigure" ]; then + # dotdee the puppet node.pp file + PUPPET_NODE_FILE=/etc/puppet/manifests/node.pp + touch "${PUPPET_NODE_FILE}" + dotdee --dir "${PUPPET_NODE_FILE}" >/dev/null 2>&1 || dotdee --setup "${PUPPET_NODE_FILE}" "#" + # dotdee the puppet modules.pp file + PUPPET_MODULES_FILE=/etc/puppet/manifests/modules.pp + touch "${PUPPET_MODULES_FILE}" + dotdee --dir "${PUPPET_MODULES_FILE}" >/dev/null 2>&1 || dotdee --setup "${PUPPET_MODULES_FILE}" "#" + # Configure storeconfigs on puppet + db_get ubuntu-orchestra-management-server/storeconfigs || true + STORECONFIGS=${RET} + if [ "$STORECONFIGS" = true ]; then + ORCHESTRA_PUPPET_CONF_D="/etc/orchestra/puppet/puppet.conf.d" + if [ -d ${ORCHESTRA_PUPPET_CONF_D} ]; then + echo [master] >> ${ORCHESTRA_PUPPET_CONF_D}/02_storeconfigs + echo "storeconfigs = true" >> ${ORCHESTRA_PUPPET_CONF_D}/02_storeconfigs + fi + fi + + if ([ -x /usr/bin/mysqld_safe ] && [ -x /usr/bin/mysql ] && [ "$STORECONFIGS" = true ]); then + db_get ubuntu-orchestra-management-server/mysql-puppet-user || "puppet" + MYSQL_PUPPET_USERNAME=${RET} + db_get ubuntu-orchestra-management-server/mysql-puppet-password || true + MYSQL_PUPPET_PASSWORD=${RET} + db_get ubuntu-orchestra-management-server/mysql-puppet-database || "puppet" + MYSQL_PUPPET_DATABASE=${RET} + if [ "$MYSQL_PUPPET_PASSWORD" = true ]; then + MYSQL_PUPPET_PASSWORD=`head -c 128 /dev/urandom | md5sum | awk '{print $1}'` + fi + mysql --defaults-extra-file=/etc/mysql/debian.cnf --execute="create database if not exists ${MYSQL_PUPPET_DATABASE}" + echo "grant all privileges on puppet.* to ${MYSQL_PUPPET_DATABASE}@localhost identified by '${MYSQL_PUPPET_PASSWORD}'" | mysql --defaults-extra-file=/etc/mysql/debian.cnf + #/usr/bin/mysql --defaults-extra-file=/etc/mysql/debian.cnf --database="puppet" --execute='create index exported_restype_title on resources (exported, restype, title(50))' || true + echo "" >> ${ORCHESTRA_PUPPET_CONF_D}/02_storeconfigs + echo "#MySQL Configuration" >> ${ORCHESTRA_PUPPET_CONF_D}/02_storeconfigs + echo "dbadapter = mysql" >> ${ORCHESTRA_PUPPET_CONF_D}/02_storeconfigs + echo "dbuser = ${MYSQL_PUPPET_USERNAME}" >> ${ORCHESTRA_PUPPET_CONF_D}/02_storeconfigs + echo "dbpassword = ${MYSQL_PUPPET_PASSWORD}" >> ${ORCHESTRA_PUPPET_CONF_D}/02_storeconfigs + echo "dbserver = localhost" >> ${ORCHESTRA_PUPPET_CONF_D}/02_storeconfigs + echo "dbsocket = /var/run/mysqld/mysqld.sock" >> ${ORCHESTRA_PUPPET_CONF_D}/02_storeconfigs + + fi + stop ubuntu-orchestra-management-server || true + start ubuntu-orchestra-management-server +fi + +#DEBHELPER# +exit 0 --- orchestra-1.7.orig/debian/ubuntu-orchestra-logging-server.postinst +++ orchestra-1.7/debian/ubuntu-orchestra-logging-server.postinst @@ -0,0 +1,25 @@ +#!/bin/sh -e + +case "$1" in + configure) + # Change dir permissions + chown syslog:syslog /var/log/orchestra + # Make sure rsyslog reads our config + invoke-rc.d rsyslog restart + ;; + + abort-upgrade|abort-remove|abort-deconfigure|triggered) + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 --- orchestra-1.7.orig/debian/ubuntu-orchestra-management-server.postrm +++ orchestra-1.7/debian/ubuntu-orchestra-management-server.postrm @@ -0,0 +1,16 @@ +#!/bin/sh -e + +if [ "$1" = "purge" ] ; then + # dotdee the puppet node.pp file + PUPPET_NODE_FILE=/etc/puppet/manifests/node.pp + dotdee --dir ${PUPPET_NODE_FILE} >/dev/null 2>&1 && dotdee --undo ${PUPPET_NODE_FILE} + # dotdee the puppet site.pp file + PUPPET_SITE_FILE=/etc/puppet/manifests/site.pp + dotdee --dir ${PUPPET_SITE_FILE} >/dev/null 2>&1 && dotdee --undo ${PUPPET_SITE_FILE} + ORCHESTRA_PUPPET_CONF_D="/etc/orchestra/puppet/puppet.conf.d" + rm -f ${ORCHESTRA_PUPPET_CONF_D}/02_storeconfigs + invoke-rc.d puppetmaster restart || true +fi + +#DEBHELPER# +exit 0 --- orchestra-1.7.orig/debian/rules +++ orchestra-1.7/debian/rules @@ -0,0 +1,5 @@ +#!/usr/bin/make -f +# -*- makefile -*- + +%: + dh $@ --- orchestra-1.7.orig/debian/ubuntu-orchestra-client.templates +++ orchestra-1.7/debian/ubuntu-orchestra-client.templates @@ -0,0 +1,8 @@ +Template: ubuntu-orchestra-client/rsyslog_host +Type: string +_Description: Hostname or IP address of the rsyslog server: + Ubuntu Orchestra collects all logs into a central syslog for + management and statistics, this host is the same one that is + used for monitoring where the ubuntu-orchestra-monitoring-server + gathers this data. + --- orchestra-1.7.orig/debian/ubuntu-orchestra-common.dirs +++ orchestra-1.7/debian/ubuntu-orchestra-common.dirs @@ -0,0 +1 @@ +/var/lib/orchestra --- orchestra-1.7.orig/debian/ubuntu-orchestra-management-server.upstart +++ orchestra-1.7/debian/ubuntu-orchestra-management-server.upstart @@ -0,0 +1,25 @@ +# orchestra-management-server + +description "Orchestra Management Server" +author "Juan Negron , Dustin Kirkland " + +start on (runlevel [2345] + and starting puppetmaster) + +script + # Create runtime directory + mkdir -p /var/run/orchestra/puppet + # Build puppet configuration file + tmp=$(mktemp) + for i in /etc/orchestra/puppet/puppet.conf.d/*; do + cat "${i}" >> "${tmp}" + done + mv -f "${tmp}" /var/run/orchestra/puppet.conf + chmod 644 /var/run/orchestra/puppet.conf + rm -f /etc/orchestra/puppet/puppet.conf + ln -sf /var/run/orchestra/puppet.conf /etc/orchestra/puppet/puppet.conf + # Ensure that Puppet starts with Orchestra's options + sed -i "s#^DAEMON_OPTS=.*#DAEMON_OPTS=\"--config /var/run/orchestra/puppet.conf\"#" /etc/default/puppetmaster + service puppetmaster restart +end script + --- orchestra-1.7.orig/debian/compat +++ orchestra-1.7/debian/compat @@ -0,0 +1 @@ +7 --- orchestra-1.7.orig/debian/ubuntu-orchestra-client.install +++ orchestra-1.7/debian/ubuntu-orchestra-client.install @@ -0,0 +1 @@ +client/* / --- orchestra-1.7.orig/debian/ubuntu-orchestra-management-server.config +++ orchestra-1.7/debian/ubuntu-orchestra-management-server.config @@ -0,0 +1,16 @@ +#! /bin/sh -e + +. /usr/share/debconf/confmodule +db_version 2.0 + +# Only ask this questions on new installs and reconfigures +if ([ "$1" = "configure" ] && [ -z "$2" ]) || [ "$1" = "reconfigure" ]; then + db_input medium ubuntu-orchestra-management-server/storeconfigs || true + db_input low ubuntu-orchestra-management-server/mysql-puppet-user || true + db_input low ubuntu-orchestra-management-server/mysql-puppet-password || true + db_input low ubuntu-orchestra-management-server/mysql-puppet-database || true + db_go +fi + +exit 0 + --- orchestra-1.7.orig/debian/ubuntu-orchestra-provisioning-server.postinst +++ orchestra-1.7/debian/ubuntu-orchestra-provisioning-server.postinst @@ -0,0 +1,8 @@ +#!/bin/sh -e + +MYHOSTNAME=$(uname -n) +fact-add role provisioner +fact-add provision-status provisioned + +#DEBHELPER# +exit 0 --- orchestra-1.7.orig/debian/changelog +++ orchestra-1.7/debian/changelog @@ -0,0 +1,340 @@ +orchestra (1.7-0ubuntu1) oneiric; urgency=low + + [ Marc Cluet ] + * Created predepend packages for monitoring and management server + - Moved preinst scripts to predepend packages + * Modified fact population in provisioner to use fact-add + * Added install of mcollective nrpe plugins on orchestra-common + + -- Marc Cluet Thu, 09 Jun 2011 06:22:01 -0700 + +orchestra (1.6-0ubuntu1) oneiric; urgency=low + + [ Dustin Kirkland ] + * debian/ubuntu-orchestra-management-server.postinst: + - fix syntax error + + -- Juan L. Negron Wed, 08 Jun 2011 21:43:39 -0700 + +orchestra (1.5-0ubuntu1) oneiric; urgency=low + + [ Dustin Kirkland ] + * debian/ubuntu-orchestra-management-server.postinst, management- + server/etc/dotdee/etc/puppet/manifests/node.pp.d/10-header, + management-server/etc/dotdee/etc/puppet/manifests/site.pp.d/10- + header: + - use dotdee's comment character support to add the header + * debian/control, provisioning-server/etc/cron.d/orchestra-import- + isos: + - use run-one for the import iso cronjob + * debian/control: + - orchestra client recommends powernap, for automatic power management + - management server recommends modules + + [ Juan L. Negron ] + * debian/ubuntu-orchestra-management-server.postrm: + - undo the dotdee config management on remove + * management-server/etc/puppet/manifests/node.pp, management- + server/etc/puppet/manifests/site.pp: + * debian/ubuntu-orchestra-management-server.postinst, management- + server/etc/puppet/manifests/node.pp, management- + server/etc/puppet/manifests/site.pp: + - empty config files should be done in postinst so dotdee and + dpkg play nice. + * debian/ubuntu-orchestra-management-server.postinst: + - Fixed syntax error. + * debian/ubuntu-orchestra-management-server.postinst, management- + server/etc/puppet/manifests/site.pp, === renamed directory + management-server/etc/dotdee/etc/puppet/manifests/site.pp.d => + management-server/etc/dotdee/etc/puppet/manifests/modules.pp.d: + - Due to puppet bug 650, restructuring config files + * management-server/etc/puppet/manifests/site.pp => management- + server/etc/puppet/manifests/modules.pp: + * debian/ubuntu-orchestra-management-server.postinst: + - Creating the file to satisfy dotdee. + * management-server/etc/dotdee/etc/puppet/manifests/modules.pp.d/10- + header, management- + server/etc/dotdee/etc/puppet/manifests/modules.pp.d/90-footer: + - removing config files no longer needed + + -- Dustin Kirkland Wed, 08 Jun 2011 15:26:38 -0400 + +orchestra (1.5-0ubuntu1) oneiric; urgency=low + + [ Dustin Kirkland ] + * debian/ubuntu-orchestra-management-server.postinst, management- + server/etc/dotdee/etc/puppet/manifests/node.pp.d/10-header, + management-server/etc/dotdee/etc/puppet/manifests/site.pp.d/10- + header: + - use dotdee's comment character support to add the header + * debian/control, provisioning-server/etc/cron.d/orchestra-import- + isos: + - use run-one for the import iso cronjob + * debian/control: + - orchestra client recommends powernap, for automatic power management + - management server recommends modules + + [ Juan L. Negron ] + * debian/ubuntu-orchestra-management-server.postrm: + - undo the dotdee config management on remove + * management-server/etc/puppet/manifests/node.pp, management- + server/etc/puppet/manifests/site.pp: + * debian/ubuntu-orchestra-management-server.postinst, management- + server/etc/puppet/manifests/node.pp, management- + server/etc/puppet/manifests/site.pp: + - empty config files should be done in postinst so dotdee and + dpkg play nice. + * debian/ubuntu-orchestra-management-server.postinst: + - Fixed syntax error. + * debian/ubuntu-orchestra-management-server.postinst, management- + server/etc/puppet/manifests/site.pp, === renamed directory + management-server/etc/dotdee/etc/puppet/manifests/site.pp.d => + management-server/etc/dotdee/etc/puppet/manifests/modules.pp.d: + - Due to puppet bug 650, restructuring config files + * management-server/etc/puppet/manifests/site.pp => management- + server/etc/puppet/manifests/modules.pp: + * debian/ubuntu-orchestra-management-server.postinst: + - Creating the file to satisfy dotdee. + * management-server/etc/dotdee/etc/puppet/manifests/modules.pp.d/10- + header, management- + server/etc/dotdee/etc/puppet/manifests/modules.pp.d/90-footer: + - removing config files no longer needed + + -- Juan L. Negron Mon, 06 Jun 2011 15:52:51 -0700 + +orchestra (1.4-0ubuntu1) oneiric; urgency=low + + * debian/ubuntu-orchestra-management-server.postinst: + - actually, use --defaults-extra-file instead, per docs + + -- Dustin Kirkland Fri, 27 May 2011 16:50:59 -0500 + +orchestra (1.4-0ubuntu1~natty19) natty; urgency=low + + * Development build + + -- Juan L. Negron Wed, 08 Jun 2011 12:04:18 -0700 + +orchestra (1.4-0ubuntu1~natty18) natty; urgency=low + + * Development build + + -- Juan L. Negron Mon, 06 Jun 2011 15:55:47 -0700 + +orchestra (1.4-0ubuntu1~natty17) natty; urgency=low + + * Development build + + -- Juan L. Negron Mon, 06 Jun 2011 14:56:34 -0700 + +orchestra (1.4-0ubuntu1~natty16) natty; urgency=low + + * Development build + + -- Juan L. Negron Mon, 06 Jun 2011 14:03:58 -0700 + +orchestra (1.4-0ubuntu1~natty15) natty; urgency=low + + * Development build. + + -- Juan L. Negron Mon, 06 Jun 2011 09:54:32 -0700 + +orchestra (1.3-0ubuntu1) oneiric; urgency=low + + * debian/ubuntu-orchestra-management-server.postinst: + - fix security issue + - we should NOT pass passwords on the command line, as these are + visible in ps output + - instead: + + use debian.cnf for user/password info + + use dash's builtin echo for piping the puppet password to mysql + on stdin + + -- Dustin Kirkland Fri, 27 May 2011 16:42:25 -0500 + +orchestra (1.2-0ubuntu1) oneiric; urgency=low + + [ Juan L. Negron ] + * debian/ubuntu-orchestra-management-server.config, debian/ubuntu- + orchestra-management-server.postinst, debian/ubuntu-orchestra- + management-server.postrm, debian/ubuntu-orchestra-management- + server.templates: + - Removed puppetmaster configuration from orchestra-puppet-recipes + and added it to ubuntu-orchestra-management-server. + * Rebuilding new packages + * debian/ubuntu-orchestra-management-server.postinst, debian/ubuntu- + orchestra-management-server.postrm, debian/ubuntu-orchestra- + management-server.templates: + - Fixed lintian issues + * : Rebuilding orchestra packages after fixing lintian issues + + -- Dustin Kirkland Fri, 27 May 2011 10:11:33 -0500 + +orchestra (1.1-0ubuntu1) oneiric; urgency=low + + [ Dustin Kirkland ] + * === added directory debian, === added directory debian/source, + COPYING, debian/compat, debian/control, debian/copyright, + debian/rules, debian/source/format: initial packaging + * debian/control: + - have client recommend squid-deb-proxy-client + * debian/control: + - updated packaging to include the sitoolchain work + * debian/control, debian/ubuntu-orchestra-common.dirs, debian/ubuntu- + orchestra-common.postinst: + - add orchestra user, create ssh-keys, depend on tools needed + * debian/control, debian/ubuntu-orchestra-common.postinst: + - make sure user's homedir is there + * debian/control, debian/ubuntu-orchestra-common.links, debian/ubuntu- + orchestra-common.postinst: + - generate ssl certs, link them into /etc, make the ssh public key + visible by other users (such as cobbler) + * debian/control: + - comment out mcollective plugins that don't yet build in this ppa + * debian/ubuntu-orchestra-common.postinst => debian/ubuntu-orchestra- + provisioning-server.postinst: + - move the user generation from common to provisioning + * debian/ubuntu-orchestra-provisioning-server.install, debian/ubuntu- + orchestra-provisioning-server.postinst, debian/ubuntu-orchestra- + provisioning-server.links: + - install provisioning server files + - enable site, and rewrite module + * debian/ubuntu-orchestra-management-server.install, debian/ubuntu- + orchestra-provisioning-server.install: + - install management server files + * provisioning-server/usr/bin/orchestra-cobbler-profiles => + provisioning-server/usr/sbin/orchestra-import-isos, === renamed + directory provisioning-server/usr/bin => provisioning- + server/usr/sbin: + - update Marc's iso importer, move to sbin, rework a bit + * provisioning-server/usr/sbin/orchestra-import-isos: + - get this working with cobbler + * debian/ubuntu-orchestra-common.links, debian/ubuntu-orchestra- + provisioning-server.postinst: + - hard link the public key + - fix ownerships of the SSL private key + * debian/copyright: + - added Juan + Marc to copyright file + * debian/control: + - adjust control for + a) config management mode, and + b) service orchestration mode + - fix lintian warnings about articles in description + * debian/ubuntu-orchestra-monitoring-server.install: + - drop for now; nagios coming soon! + * debian/control, debian/ubuntu-orchestra-client.preinst, + debian/ubuntu-orchestra-management-server.preinst, debian/ubuntu- + orchestra-provisioning-server.preinst: + - fix lintian errors, add debhelper tokens and misc depends + * === added directory debian/po, debian/control, + debian/po/POTFILES.in, debian/po/templates.pot, debian/rules, + debian/ubuntu-orchestra-client.templates: + - make the debconf stuff translatable, fix lintian errors + * debian/ubuntu-orchestra-client.postinst, debian/ubuntu-orchestra- + provisioning-server.preinst: + - drop full paths to common utilities + * debian/ubuntu-orchestra-client.templates: + - fix linitian issues with the debconf text + * debian/control, debian/ubuntu-orchestra-monitoring-server.postinst: + - clean up some of the empty package lintian warnings + * debian/ubuntu-orchestra-client.postinst, debian/ubuntu-orchestra- + client.preinst, debian/ubuntu-orchestra-client.templates, + debian/ubuntu-orchestra-logging-server.postinst, debian/ubuntu- + orchestra-management-server.preinst, debian/ubuntu-orchestra- + provisioning-server.preinst: + - don't ignore pre/post inst errors, fix verbiage + * debian/control, debian/ubuntu-orchestra-client.postinst: + - fix lintian error about python depends, fix bashism + * === added directory provisioning-server/usr/share/man, === added + directory provisioning-server/usr/share/man/man8, provisioning- + server/usr/share/man/man8/orchestra-generate-cloud-init.8, + provisioning-server/usr/share/man/man8/orchestra-import-isos.8: + - add manpage documentation for provisioning utilities + * debian/control: note the empty meta pacakges + + [ Juan L. Negron ] + * Updating version and rebuilding packages + * debian/ubuntu-orchestra-management-server.upstart: + - fix RegEx for default puppetmaster configuration + * debian/ubuntu-orchestra-management-server.upstart: + - restart puppetmaster after reconfiguring + * debian/ubuntu-orchestra-management-server.upstart: + - puppetmaster is not an upstart job + * debian/ubuntu-orchestra-management-server.upstart: + - change permissions on puppetmaster configuration + * debian/ubuntu-orchestra-management-server.upstart: + - modified puppetmaster to usr the config file and + not a link. + * debian/ubuntu-orchestra-provisioning-server.postinst: + - Create the provisioner role + * management-server/etc/orchestra/puppet/puppet.conf.d/02_certname: + - Adding default certname + * Added ubuntu-orchestra-client postinst + * Modified control to reflect more dependencies on ubuntu-orchestra-common + * Created postinst for ubuntu-orchestra-client + * Modified user-data template to reflect changes + * debian/control: + - Fixed syntax error in control file + * Rebuilding package + * debian/control: + - Modifying monitoring server to recommend collectd. + * Rebuilding package + * Modified preinst scripts + * Modified postinst for orchestra-client and provisioning-server + * Fixed install scripts for orchestra-client and monitoring-server + * Rebuilding packages + * Updating version and rebuilding + + [ Marc Cluet ] + * Created new ubuntu-orchestra-logging server package + - Moved rsyslog dependencies from monitoring to logging + * Added debconf preseed on provisioning server preinst + * Modified postinst for orchestra-client and provisioning-server + * Fixed install scripts for orchestra-client and monitoring-server + * Added rsyslog integration (client and server) + * Added ubuntu-orchestra-monitoring-server + * Modified preinst templates for hostname discovery + * Added monitoring.ipaddress parameter on provisioning.conf + * Added preinst host sanity check to handle hostname resolvableness issues in + - ubuntu-orchestra-client + - ubuntu-orchestra-management-server + - ubuntu-orchestra-provisioning-server + * Fixed problem with just commenting collectd, removed lines + * Changed restart order on provisioner server postinst for + squid-deb-proxy + - Added ubuntu-orchestra-provisioning-server.postinst + - This deals with squid-deb-proxy server configuration + - Removed dependency on collectd on client + - Filled bug LP: #773420 to readd once properly configured + - Modified ubuntu-orchestra-client dependencies + - Added dependency for mcollective-plugins-provisioner + * Added ubuntu-orchestra-client postinst + * Modified control to reflect more dependencies on ubuntu-orchestra-common + * Created postinst for ubuntu-orchestra-client + * Modified user-data template to reflect changes + * Fixing cloud-init templates + * Removed puppetca mcollective plugins from client template + * Added runcmd in puppetdata to force certname on client + * cloud-init user-data.tpl + * Added runcmd commands to add initial facts + * Fixed /var/lib/orchestra/cloud-init/user-data.tpl + - Now it won't try to install mcollective-middleware + * Added new script orchestra-generate-cloud-init + * Renamed cloud-init templates in /usr/share/orchestra/cloud-init + * Created default cloud-init template in /var/lib/orchestra/cloud-init + * Fixed apache config for cloud-init service + * Added user-data binary + * Moved /etc/orchestra.conf.d to /etc/orchestra/conf.d + - Modified meta-data.py to reflect change + * Created /etc/orchestra/import_isos + - Modified /usr/sbin/orchestra-import-isos to reflect change + * Added apache2 meta-data configuration + * Added meta-data.py for meta-data generation + - Added provisioning.conf for provisioning-server + - debian/control + - Added mcollective-server-provisioner and mcollective-client as + dependencies for provisioner + - provisioning-server/usr/share/orchestra/cloud-init/orchestra-management-server.txt + - Removed dependency from management server + + -- Dustin Kirkland Wed, 25 May 2011 11:51:35 -0500 --- orchestra-1.7.orig/debian/ubuntu-orchestra-management-server.install +++ orchestra-1.7/debian/ubuntu-orchestra-management-server.install @@ -0,0 +1 @@ +management-server/* / --- orchestra-1.7.orig/debian/copyright +++ orchestra-1.7/debian/copyright @@ -0,0 +1,41 @@ +This package was debianized by Dustin Kirkland +Wed Jan 12 12:43:20 CST 2011 + +It was downloaded from: http://launchpad.net/orchestra + +Upstream Authors: + Chuck Short + Dave Walker + Dustin Kirkland + Juan Negron + Marc Cluet + +Copyright: + Copyright (C) 2011 Canonical Ltd. + + All rights reserved. + +License: + + Ubuntu Orchestra Services + Copyright (C) 2011 Canonical Ltd. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as + published by the Free Software Foundation, version 3 of the + License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . + +The Ubuntu packaging: + Copyright (C) 2011 Canonical Ltd. + released under the GPL-3. + +On Debian systems, the complete text of the GNU General Public +License, version 3, can be found in /usr/share/common-licenses/GPL-3. --- orchestra-1.7.orig/debian/ubuntu-orchestra-common.links +++ orchestra-1.7/debian/ubuntu-orchestra-common.links @@ -0,0 +1,2 @@ +var/lib/orchestra/ssl-cert-orchestra.pem etc/ssl/certs/ssl-cert-orchestra.pem +var/lib/orchestra/ssl-cert-orchestra-pk.pem etc/ssl/private/ssl-cert-orchestra-pk.pem --- orchestra-1.7.orig/debian/ubuntu-orchestra-monitoring-server-predepend.preinst +++ orchestra-1.7/debian/ubuntu-orchestra-monitoring-server-predepend.preinst @@ -0,0 +1,17 @@ +#!/bin/sh -e + +MYHOSTNAME=$(uname -n) + +echo "postfix postfix/main_mailer_type select Internet Site" | debconf-set-selections +echo "postfix postfix/mailname string $MYHOSTNAME" | debconf-set-selections +echo "postfix postfix/destinations string ${MYHOSTNAME}, localhost.localdomain, , localhost" | debconf-set-selections +echo "postfix postfix/protocols select all" | debconf-set-selections + +echo "nagios3-cgi nagios3/httpd multiselect apache2" | debconf-set-selections +echo "nagios3-cgi nagios3/adminpassword-mismatch note" | debconf-set-selections +echo "nagios3-cgi nagios3/nagios1-in-apacheconf boolean false" | debconf-set-selections +echo "nagios3-cgi nagios3/adminpassword-repeat password orchestra" | debconf-set-selections +echo "nagios3-cgi nagios3/adminpassword password orchestra" | debconf-set-selections + +#DEBHELPER# +exit 0 --- orchestra-1.7.orig/debian/ubuntu-orchestra-client.postinst +++ orchestra-1.7/debian/ubuntu-orchestra-client.postinst @@ -0,0 +1,67 @@ +#!/bin/sh -e +# postinst script for orchestra-client +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `configure' +# * `abort-upgrade' +# * `abort-remove' `in-favour' +# +# * `abort-remove' +# * `abort-deconfigure' `in-favour' +# `removing' +# +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + +# A simplified version of debconf's own config script. +. /usr/share/debconf/confmodule + +case "$1" in + configure) + db_get ubuntu-orchestra-client/rsyslog_host + if [ "${RET}z" != "z" ] + then + if [ ! -f "/etc/rsyslog.d/99-orchestra.conf" ] + then + cat /usr/share/orchestra/rsyslog/orchestra-client.conf | sed s/1.1.1.1/$RET/ > /etc/rsyslog.d/99-orchestra.conf + fi + fi + + # Make sure puppet can start on its own + mv /etc/default/puppet /etc/default/.puppet + cat /etc/default/.puppet | sed 's/START=no/START=yes/' > /etc/default/puppet + rm -f /etc/default/.puppet + + # Add certname to puppet + printf "[agent]\ncertname = %s\n" $(uname -n | tr "[A-Z]" "[a-z]") >> /etc/puppet/puppet.conf + + # Add starting facts + fact-add provision-status unprovisioned + fact-add role undefined + + # Make sure puppet is stopped + invoke-rc.d puppet stop + + # Make sure rsyslog reads our config + invoke-rc.d rsyslog restart + ;; + + abort-upgrade|abort-remove|abort-deconfigure|triggered) + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 --- orchestra-1.7.orig/debian/ubuntu-orchestra-logging-server.dirs +++ orchestra-1.7/debian/ubuntu-orchestra-logging-server.dirs @@ -0,0 +1 @@ +/var/log/orchestra --- orchestra-1.7.orig/debian/ubuntu-orchestra-client.preinst +++ orchestra-1.7/debian/ubuntu-orchestra-client.preinst @@ -0,0 +1,19 @@ +#!/bin/sh -e + +if [ -s /etc/hostname ]; then + # hostname file exists, is not empty, read hostname + hostname=$(cat /etc/hostname) + if ! grep -qs "\W$hostname" /etc/hosts; then + # hostname does not exist in /etc/hosts + if grep -qs "127\.0\.1\.1\W" /etc/hosts; then + # 127.0.1.1 exists, so append to line + sed -i "s/\(127\.0\.1\.1.*\)/\1 $hostname/" /etc/hosts + else + # 127.0.1.1 does not exist, so add entire line + echo "127.0.1.1 $hostname" >> /etc/hosts + fi + fi +fi + +#DEBHELPER# +exit 0 --- orchestra-1.7.orig/debian/ubuntu-orchestra-management-server-predepend.preinst +++ orchestra-1.7/debian/ubuntu-orchestra-management-server-predepend.preinst @@ -0,0 +1,24 @@ +#!/bin/sh -e + +if [ -s /etc/hostname ]; then + # hostname file exists, is not empty, read hostname + hostname=$(cat /etc/hostname) + if ! grep -qs "\W$hostname" /etc/hosts; then + # hostname does not exist in /etc/hosts + if grep -qs "127\.0\.1\.1\W" /etc/hosts; then + # 127.0.1.1 exists, so append to line + sed -i "s/\(127\.0\.1\.1.*\)/\1 $hostname/" /etc/hosts + else + # 127.0.1.1 does not exist, so add entire line + echo "127.0.1.1 $hostname" >> /etc/hosts + fi + fi +fi + +MYIP=$(ifconfig eth0 | grep "inet addr" | awk -F":" '{print $2}' | awk '{print $1}') +echo "mcollective mcollective/stomp_host string $MYIP" | debconf-set-selections +echo "mcollective-client mcollective/stomp_host string $MYIP" | debconf-set-selections +echo "cobbler cobbler/password password orchestra" | debconf-set-selections + +#DEBHELPER# +exit 0 --- orchestra-1.7.orig/debian/control +++ orchestra-1.7/debian/control @@ -0,0 +1,162 @@ +Source: orchestra +Section: admin +Priority: optional +Maintainer: Ubuntu Server Team +Standards-Version: 3.9.1 +Build-Depends: debhelper (>= 7), po-debconf +Homepage: http://launchpad.net/orchestra +Vcs-Bzr: http://bazaar.launchpad.net/~orchestra/orchestra/trunk + +Package: ubuntu-orchestra-common +Architecture: all +Depends: ${misc:Depends}, + adduser, + dotdee, + facter, + facter-customfacts-plugin, + openssh-client, + openssl, + puppet, + mcollective, + mcollective-plugins-filemgr, + mcollective-plugins-iptables, + mcollective-plugins-nettest, + mcollective-plugins-nrpe, + mcollective-plugins-package, + mcollective-plugins-process, + mcollective-plugins-puppetd, + mcollective-plugins-puppetral, + mcollective-plugins-service, + mcollective-plugins-facts-facter, + mcollective-plugins-fact, + mcollective-plugins-upuppet, + mcollective-plugins-uapt, + mcollective-plugins-kill, + mcollective-plugins-uservice +Suggests: + po-debconf +Description: Ubuntu Orchestra common files + This package provides the common files used by the Ubuntu Orchestra + Services suite. + +Package: ubuntu-orchestra-server +Architecture: all +Depends: ${misc:Depends}, + ubuntu-orchestra-common +Recommends: + ubuntu-orchestra-provisioning-server, + ubuntu-orchestra-management-server, + ubuntu-orchestra-monitoring-server, +# ubuntu-orchestra-orchestration-server, + ubuntu-orchestra-logging-server +Description: Ubuntu Orchestra Services suite + This virtual package installs the dependencies necessary to provision, + manage, and monitor an Ubuntu-based data center. + . + It also includes some configuration necessary to make this work well + out of the box. + +Package: ubuntu-orchestra-client +Architecture: all +Depends: ${misc:Depends}, + capistrano, + nagios-statd-client, + openssh-server, + ubuntu-orchestra-common, + mcollective-plugins-provisioner +Recommends: + rsyslog, + powernap, + squid-deb-proxy-client, + nagios-nrpe-server +Description: Ubuntu Orchestra Client + This package installs the dependencies necessary on a client system + in order to be managed by the Ubuntu Orchestra Management Server. + . + It also includes some configuration necessary to make this work well + out of the box. + +Package: ubuntu-orchestra-logging-server +Architecture: all +Depends: ${misc:Depends}, + rsyslog, + ubuntu-orchestra-common +Description: Ubuntu Orchestra Logging Server + This package installs the dependencies necessary to log events in + an Ubuntu data center. + . + It also includes some configuration necessary to make this work well + out of the box. + +Package: ubuntu-orchestra-monitoring-server-predepend +Architecture: all +Description: Ubuntu Orchestra Monitoring Server Predepend + Automatic predepend configuration for the Monitoring Server + +Package: ubuntu-orchestra-monitoring-server +Architecture: all +Pre-Depends: ubuntu-orchestra-monitoring-server-predepend +Depends: ${misc:Depends}, + nagios-statd-server, + ubuntu-orchestra-common +Recommends: nagios3-cgi, + nagios-nrpe-server +Description: Ubuntu Orchestra Monitoring Server + This virtual package installs the dependencies necessary to monitor an + Ubuntu data center. + . + It also includes some configuration necessary to make this work well + out of the box. + +Package: ubuntu-orchestra-provisioning-server +Architecture: all +Depends: ${misc:Depends}, ${python:Depends}, + cobbler, + mcollective-server-provisioner, + mcollective, + mcollective-client, + run-one, + ubuntu-orchestra-common +Recommends: squid-deb-proxy +Description: Ubuntu Orchestra Provisioning Services suite + This package installs the dependencies necessary to provision Ubuntu + systems over the network. + . + It also includes some configuration necessary to make this work well + out of the box. + +Package: ubuntu-orchestra-management-server-predepend +Architecture: all +Description: Ubuntu Orchestra Management Server Predepend + Automatic predepend configuration for the Management Server + +Package: ubuntu-orchestra-management-server +Architecture: all +Pre-Depends: ubuntu-orchestra-management-server-predepend +Depends: ${misc:Depends}, + mcollective, + mcollective-middleware, + mcollective-client, + mcollective-plugins-puppetca, + puppetmaster, + libactiverecord-ruby, + rabbitmq-stomp, + ubuntu-orchestra-common +Recommends: ubuntu-orchestra-modules +Description: Ubuntu Orchestra Configuration Management Server + This package installs the dependencies necessary to comprehensively + manage an Ubuntu data center using a Configuration Management System. + . + It also includes some configuration necessary to make this work well + out of the box. + +#Package: ubuntu-orchestra-orchestration-server +#Architecture: all +#Depends: ${misc:Depends}, +## ensemble and friends +#Description: Ubuntu Orchestra Orchestration Server +# This package installs the dependencies necessary to operate an Ubuntu +# data center using a Service Orchestration System. +# . +# It also includes some configuration necessary to make this work well +# out of the box. --- orchestra-1.7.orig/debian/ubuntu-orchestra-management-server.templates +++ orchestra-1.7/debian/ubuntu-orchestra-management-server.templates @@ -0,0 +1,40 @@ +Template: ubuntu-orchestra-management-server/storeconfigs +Type: boolean +Default: true +Description: Enable storeconfigs option in your puppet master? + Puppet uses a technique called stored configuration, enabled with the + storeconfigs configuration option, to store data in a database. + + This technique makes use of the Ruby on Rails framework and one of + three database back-ends: SQLite (the default), MySQL or PostgreSQL. + Additionally, a message queue can be used to improve a puppetmaster’s + client response time. Currently stored configurations are principally + used by exported resources. + +Template: ubuntu-orchestra-management-server/mysql-puppet-user +Type: string +Default: puppet +Description: Please enter the puppet user in MySQL: + storeconfigs on puppetmaster has an option of using MySQL as a + backend database as a more efficient option than the default + SQLite. Orchestra needs the username to be used for the puppet account. + It defaults to "puppet". + +Template: ubuntu-orchestra-management-server/mysql-puppet-password +Type: password +Default: puppet +Description: Please enter a password for the puppet user in MySQL: + storeconfigs on puppetmaster has an option of using MySQL as a + backend database as a more efficient option than the default + SQLite. For this option to work properly, the puppet user on + MySQL needs a password. This password will default to a randomly + generated one if none is provided. + +Template: ubuntu-orchestra-management-server/mysql-puppet-database +Type: string +Default: puppet +Description: Please enter the database name of your puppet configuration: + storeconfigs on puppetmaster has an option of using MySQL as a + backend database as a more efficient option than the default + SQLite. For this option to work properly, a database name is needed. + The default name of "puppet" will be used if none is provided --- orchestra-1.7.orig/debian/ubuntu-orchestra-provisioning-server.install +++ orchestra-1.7/debian/ubuntu-orchestra-provisioning-server.install @@ -0,0 +1 @@ +provisioning-server/* / --- orchestra-1.7.orig/debian/ubuntu-orchestra-logging-server.install +++ orchestra-1.7/debian/ubuntu-orchestra-logging-server.install @@ -0,0 +1 @@ +logging-server/* / --- orchestra-1.7.orig/debian/po/POTFILES.in +++ orchestra-1.7/debian/po/POTFILES.in @@ -0,0 +1 @@ +[type: gettext/rfc822deb] ubuntu-orchestra-client.templates --- orchestra-1.7.orig/debian/po/templates.pot +++ orchestra-1.7/debian/po/templates.pot @@ -0,0 +1,34 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: orchestra@packages.debian.org\n" +"POT-Creation-Date: 2011-05-25 11:43-0500\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: string +#. Description +#: ../ubuntu-orchestra-client.templates:1001 +msgid "Hostname or IP address of the rsyslog server:" +msgstr "" + +#. Type: string +#. Description +#: ../ubuntu-orchestra-client.templates:1001 +msgid "" +" Ubuntu Orchestra collects all logs into a central syslog for\n" +" management and statistics, this host is the same one that is\n" +" used for monitoring where the ubuntu-orchestra-monitoring-server\n" +" gathers this data." +msgstr "" --- orchestra-1.7.orig/debian/source/format +++ orchestra-1.7/debian/source/format @@ -0,0 +1 @@ +1.0