Changeset 181

Timestamp:

09/16/06 15:01:57 (2 years ago)

Author:

lunar

Message:

Load /tmp/tmp.ciOCm13901/metche-1.1 into
debian/branches/upstream/current.

Files:

• debian/branches/upstream/current/Changelog (modified) (1 diff)
• debian/branches/upstream/current/FAQ (added)
• debian/branches/upstream/current/INSTALL (modified) (1 diff)
• debian/branches/upstream/current/Makefile (added)
• debian/branches/upstream/current/NEWS (added)
• debian/branches/upstream/current/README (modified) (6 diffs)
• debian/branches/upstream/current/metche (modified) (20 diffs, 1 prop)
• debian/branches/upstream/current/metche-manpage.sgml (added)
• debian/branches/upstream/current/metche.8 (modified) (1 diff)
• debian/branches/upstream/current/metche.conf.default (modified) (3 diffs)

debian/branches/upstream/current/Changelog

@@ -1 @@
-
+
+
+
+
+
+
+
+
-
-        * Initial release.
-

debian/branches/upstream/current/INSTALL

@@ -3 +3 @@
-`-------------------------------------------------------------------------------
-
-to
+at
-2. Copy the metche executable to /usr/local/sbin/
-
-
-
+
+
-

debian/branches/upstream/current/README

@@ -1 +1 @@
-metche - reducing root bus factor
-
+
+
-
-,-------------------------------------------------------------------------------
@@ -23 +24 @@
-`-------------------------------------------------------------------------------
-
-facilitate collective sysadmin ; basically, it
+ease collective system administration. It does
-periodically :
-s the "system state" to $BACKUP_DIR (default /var/lib/metche), i.e. :
+ the "system state" of 
-      . $WATCHED_DIR (default: /etc)
-      . $CHANGELOG_FILE (default /root/Changelog)
-        or $CHANGELOG_DIR/*/Changelog (default: /root/changelogs/*/Changelog)
-      . Debian packages states and versions (using apt-show-versions)
-
-
+
+
+
+
-
-,-------------------------------------------------------------------------------
@@ -37 +40 @@
-`-------------------------------------------------------------------------------
-
-job, and y
-, it's not useful at all if you don't 
-$EMAIL_ADDRESS config variable to your sysadmin collective mailing-list
-address 
+ job. Y
+ it's not useful at all if you don't
+the $EMAIL_ADDRESS config variable to your sysadmins' collective 
+mailing-list or email address
-   - use the Changelog files in a rigorous way.
-
-it is dangerous to use metche without before
-
+It is dangerous to use metche without
+ before
-
-
+
+
-
-,-------------------------------------------------------------------------------
@@ -52 +56 @@
-`-------------------------------------------------------------------------------
-
-s
-
+
+ 
-   * mutt
-   * bzip2
- you 
- 
+
+
-   * If you want metche to monitor one manually written Changelog file,
-     it must be located at $CHANGELOG_FILE.
-_or_ If you want metche to monitor multiple manually written Changelog
- 
-, you can have 
+
+ this way
-        /root/
-            changelogs/
@@ -73 +77 @@
-`-------------------------------------------------------------------------------
-
-S
+Please s
-
-,-------------------------------------------------------------------------------
@@ -82 +86 @@
-   your needs.
-2. Read the next sections of this document and the metche(8) manpage.
- 
+
-     0-59/5 * * * * root test -x /usr/local/sbin/metche && \
-                         /usr/local/sbin/metche cron
+   See the cron (8) manpage for further explanations on how to create a cron 
+   job.
-
-,-------------------------------------------------------------------------------
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-`-------------------------------------------------------------------------------
-
-Read the SECURITY section of metche(8). Really.
-
-,-------------------------------------------------------------------------------
-| FAQ
-`-------------------------------------------------------------------------------
-
-1. How are the monitored Changelog files ($CHANGELOG_FILE or
-   $CHANGELOG_DIR/*/Changelog) generated ?
-
-   With Emacs or Vim. Ah ah. They are written by *you* ! They are an important
-   part of the collective sysadmin process metche is supposed to facilitate.
-
-2. Hey, how is metche working, and what are the underlying concepts I have to
-   know ?
-
-   When called with the "cron" command line switch, metche looks if the "system
-   state" has changed in the last $TESTING_TIME minutes. If it is the case, a
-   "unstable" state is saved. Otherwise, a "testing state" is saved, and a
-   report is emailed to you.
-
-   A similar mechanism to automatically turn a "testing" state into a "stable"
-   one ; see metche(8) for explainations.
-
-3. How do I see the saved states list ?
-
-   Run "metche list".
-
-4. I've broken my system, how can I see a report against a previous, known
-   working, system state ?
-
-   Run "metche report [{stable,testing,unstable}-YYYYMMDDHHMM]".
-   If no saved state is specified, the latest "testing state" is used as
-   reference.
-
-5. How do I create a "stable state" by hand ?
-
-   Run "metche stabilize [testing-YYYYMMDDHHMM]".
-   This turns the given testing state, if specified, or the latest one,
-   otherwise, into a "stable state".

debian/branches/upstream/current/metche

@@ -1 +1 @@
-#! /bin/bash
-# -*- mode: sh; sh-basic-offset: 4; indent-tabs-mode: nil; -*-
+#
+# SVN version: $Id: metche 176 2006-09-15 15:31:11Z intrigeri $
+# $URL: http://poivron.org/dev/svn/metche/upstream/tags/metche-1.1/metche $
-#
-#  metche: reducing root bus factor
@@ -28 +31 @@
-
-display_usage() {
-
-
+
+
+
-           "[{stable|testing|unstable}-YYYYMMDDHHMM]"
+      echo "       `basename $0` [-h VSERVER] stabilize [testing-YYYYMMDDHHMM]"
+      echo ""
+      echo "       With -h, the VServer VSERVER is operated on instead of the host system."
+      echo ""
+      echo "Non-interactive usage:"
-      echo "       `basename $0` cron"
-      echo "       `basename $0` stabilize [testing-YYYYMMDDHHMM]"
-      echo ""
-    ) >&2
@@ -38 +46 @@
-
-fatal() {
-
+Fatal:   
-    exit 2
+}
+
+warning() {
+    echo -e "Warning: $@" >&2
+}
+
+debug() {
+    [ "$DEBUG" != yes ] || echo -e "Debug:   $@" >&2
-}
-
@@ -45 +61 @@
-    local executable="$1"
-    local software="$2"
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-}
-
-email() {
-email $@
-
+* email $@ to $EMAIL_ADDRESS
+`current_system` - 
-    if [ $ENCRYPT_EMAIL = "yes" ]; then
-        LC_ALL="$LOCALE" gpg --batch --armor --encrypt \
@@ -64 +84 @@
-        LC_ALL="$LOCALE" mutt -s "$subject" "$EMAIL_ADDRESS"
-    fi
+}
+
+current_system() {
+    $VSERVER_EXEC_PREFIX hostname -f
-}
-
@@ -83 +107 @@
-EMAIL_ADDRESS="root@`hostname -f`"
-ENCRYPT_EMAIL="no"
-
-
-
+
+
+
+
+
-LOCALE="C"
-
-
+
+
+
+
+
-_NO_DEBIAN_PACKAGES_CHANGE="No change in Debian packages state."
-_NO_CHANGE="No change."
@@ -127 +157 @@
-
-if [ "$1" = "-h" ]; then
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-    CMD="$1"
-    MILESTONE="$2"
+fi
+
+if [ -f /etc/metche.conf ]; then
+    . /etc/metche.conf
-else
-    display_usage
@@ -151 +179 @@
-umask 077
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-fi
-
-if [ "$ENCRYPT_EMAIL" = "yes" ]; then
-    which gpg > /dev/null ||
-
-
-
+
-fi
-
-DATE=`date "+%Y%m%d%H%M"`
-WATCHED_PARENT=`dirname $WATCHED_DIR`
-if [ "$WATCHED_PARENT" != '/' ]; then
-    WATCHED_PARENT="$WATCHED_PARENT/"
-fi
-
-# How to use $TAR_OPTS:
@@ -198 +251 @@
-set +o noglob
-
-###
-### Modules enabling/disabling
-###
-
-DO_CHANGELOGS="no"
-if [ "$CHANGELOG_DIR" ]; then
-    if [ -d "$CHANGELOG_DIR" ]; then
-        DO_CHANGELOGS="dir"
-    fi
-elif [ -f "$CHANGELOG_FILE" ]; then
-    DO_CHANGELOGS="file"
-fi
-
-# Debian packages
-# Enabled/disabled by $DO_PACKAGES, initialized to "yes", can be
-# overriden by the sourced conf file.
-
-
-###
-### A few functions to do the real work
-###
+
+# Check and mangle the context-dependant configuration variables,
+# i.e. the parameters specific to the host system or to a given VServer.
+# If $1 is empty, operate on the host system.
+# Else, operate on a VServer and return with exit-code:
+#   - 2 if $1 is not an existing VServer
+#   - 3 if $1 is not a VServer listed in VSNAMES
+#   - 4 if $1 is not a running VServer
+# Anyway, return with exit-code:
+#   - 5 if the GnuPG public key can not be found
+context_config() {
+    local vsname="$1"
+    local res
+    debug "-------- Operating on" \
+          "`if [ -z $vsname ]; then echo 'the host system'; else echo VServer $vsname; fi`"
+    debug "* context_config"
+
+    #
+    # Variables & VServer
+    #
+
+    if [ -z "$vsname" ]; then
+        WATCHED_DIR="$_WATCHED_DIR"
+        BACKUP_DIR="$_BACKUP_DIR"
+        VSERVER_EXEC_PREFIX=""
+        EMAIL_ADDRESS="$_EMAIL_ADDRESS"
+    else
+        WATCHED_DIR="$VROOTDIR/$vsname/$_WATCHED_DIR"
+        BACKUP_DIR="$_BACKUP_DIR/$vsname"
+        VSERVER_EXEC_PREFIX="$VSERVER $vsname exec"
+        EMAIL_ADDRESS="root@`current_system`"
+        # does the current VServer exist ?
+        if [ ! -d "$VROOTDIR/$vsname" ]; then
+            warning "  VServer $vsname does not exist (error 2)."
+            return 2
+        fi
+        # is the current VServer listed in VSNAMES ?
+        local found="no";
+        for i in $VSNAMES; do
+            if [ "$vsname" = "$i" ]; then
+                found=yes
+                break
+            fi
+        done
+        if [ $found = no ]; then
+            warning "  VServer $vsname is not listed in VSNAMES (error 3)."
+            return 3
+        fi
+        # is the current VServer running ?
+        res=""
+        $VSERVERINFO -q "$vsname" RUNNING || res=failed
+        if [ "$res" = failed ]; then
+            warning "  VServer $vsname is not running (error 4)."
+            return 4
+        fi
+    fi
+
+    # E-mail encryption
+    if [ $ENCRYPT_EMAIL = "yes" ]; then
+        gpg --batch --list-public-keys $EMAIL_ADDRESS >/dev/null 2>&1
+        res=$?
+        if [ $res -ne 0 ]; then
+            warning "  GnuPG public key for $EMAIL_ADDRESS not found."
+            return 5
+        fi
+    fi
+
+    #
+    # Files and directories
+    #
+
+    # Check the existence of WATCHED_DIR
+    test -d "$WATCHED_DIR" || \
+        fatal "$WATCHED_DIR directory (built from WATCHED_DIR) does not exist."
+
+    # Initialize WATCHED_PARENT
+    WATCHED_PARENT=`dirname $WATCHED_DIR`
+    if [ "$WATCHED_PARENT" != '/' ]; then
+        WATCHED_PARENT="$WATCHED_PARENT/"
+    fi
+
+    # Check the existence of the resulting BACKUP_DIR, creating it if needed.
+    if [ ! -d "$BACKUP_DIR" ]; then
+        debug "  Creating $BACKUP_DIR directory for `current_system`."
+        if mkdir -p "$BACKUP_DIR"; then
+            debug "  Successfully created $BACKUP_DIR directory."
+        else
+            fatal "  Failed to create $BACKUP_DIR directory."
+        fi
+    fi
+
+    #
+    # Modules enabling/disabling
+    #
+
+    # DO_CHANGELOGS
+    DO_CHANGELOGS="no"
+    if [ -n "$_CHANGELOG_DIR" ]; then
+        if [ -z "$vsname" ]; then
+            CHANGELOG_DIR="$_CHANGELOG_DIR"
+        else
+            CHANGELOG_DIR="$VROOTDIR/$vsname$_CHANGELOG_DIR"
+        fi
+        if [ -d "$CHANGELOG_DIR" ]; then
+            DO_CHANGELOGS="dir"
+        else
+            warning "  The directory $CHANGELOG_DIR (built from CHANGELOG_DIR)" \
+                    "  does not exist. Changelogs file monitoring thereferore" \
+                    "  cannot be performed this time for `current_system`."
+        fi
+    elif [ -n "$CHANGELOG_FILE" ]; then
+        if [ -z "$vsname" ]; then
+            CHANGELOG_FILE="$_CHANGELOG_FILE"
+        else
+            CHANGELOG_FILE="$VROOTDIR/$vsname$_CHANGELOG_FILE"
+        fi
+        if [ -f "$CHANGELOG_FILE" ]; then
+            DO_CHANGELOGS="file"
+        else
+            warning "  The file $CHANGELOG_FILE (built from CHANGELOG_FILE)"
+            warning "  does not exist. Changelog file monitoring thereferore"
+            warning "  cannot be performed this time for `current_system`."
+        fi
+    fi
+
+    # DO_PACKAGES
+    DO_PACKAGES="$_DO_PACKAGES"
+    if [ "$DO_PACKAGES" = "yes" ]; then
+        $VSERVER_EXEC_PREFIX which apt-show-versions > /dev/null
+        res=$?
+        if [ $res -ne 0 ]; then
+            warning "  apt-show-versions not found on `current_system`."
+            warning "  Please install it or turn DO_PACKAGES off."
+            warning "  DO_PACKAGES therefore cannot be performed this time"
+            warning "  for `current_system`."
+            DO_PACKAGES=no
+        fi
+    fi
+
+    #
+    # Final steps to get a coherent initial status
+    #
+
+    # Make sure we've got at least one testing and one stable
+    milestone_exists testing-latest || save_state "testing"
+    milestone_exists stable-latest || stabilize_state "testing-latest"
+}
-
-# Returns 0 if, and only if, specified milestone exists.
@@ -277 +460 @@
-# This will save an archive of the watched directory with the given prefix
-save_files() {
-
+  
-    set -o noglob
-    tar jcf "$BACKUP_DIR/$1-$DATE".tar.bz2 \
@@ -287 +470 @@
-# This will save packages list with the given prefix
-save_packages() {
-
-
-
+  
+$VSERVER_EXEC_PREFIX 
+$VSERVER_EXEC_PREFIX 
-        sort > "$BACKUP_DIR/$1-$DATE".packages
-    ln -sf "$1-$DATE".packages "$BACKUP_DIR/$1"-latest.packages
@@ -296 +479 @@
-# This will save Changelogs with the given prefix
-save_changelogs() {
-
+  
-    local changelog domain file
-
@@ -315 +498 @@
-# Save whatever reflect the current state with the given prefix
-save_state() {
-
+* 
-    save_files "$1"
-    [ $DO_PACKAGES = "no" ] || save_packages "$1"
@@ -323 +506 @@
-# Report changes against given version to standard output
-report_changes() {
-
+* 
-    local tmp tmpdir changelog domain diff tar_diff diff_diff
-    local files old new tmp_packages file
@@ -398 +581 @@
-
-        tmp_packages=`mktemp -q`
-
-
-
+$VSERVER_EXEC_PREFIX 
+$VSERVER_EXEC_PREFIX 
+N
-            echo "$_NO_DEBIAN_PACKAGES_CHANGE"
-        fi | grep -v '^[0-9-]' >> "$tmp"
@@ -430 +613 @@
-# NB: argument validity is supposed to have been already checked.
-stabilize_state() {
-
+* 
-    local testing stable file dst
-
@@ -507 +690 @@
-###
-
-# make sure we've got at least one testing and one stable
-milestone_exists testing-latest || save_state "testing"
-milestone_exists stable-latest || stabilize_state "testing-latest"
-
-case "$CMD" in
-
-    report)
+        context_config "$VSNAME" || fatal "Aborting (error $?)."
-        DO_DETAILS="yes"
-        if [ -z "$MILESTONE" ]; then
@@ -526 +706 @@
-
-    list)
+        context_config "$VSNAME" || fatal "Aborting (error $?)."
-        for file in "$BACKUP_DIR"/*.tar.bz2; do
-            echo `basename ${file%%.tar.bz2}`
@@ -533 +714 @@
-    cron)
-        STABLE_TIME_MIN=`expr 24 '*' 60 '*' "$STABLE_TIME"`
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                        email "stable-$DATE"
-
-
-
-
+
+
+
+
+
-                fi
-
-
-
-
+
+
+
+
+
+
+
+
-                save_state "unstable"
-            fi
-else
-    save_state "unstable"
-fi
+    
+done
+
-        ;;
-
-    stabilize)
+        context_config "$VSNAME" || fatal "Aborting (error $?)."
-        if [ -z "$MILESTONE" ]; then
-            stabilize_state "testing-latest"
@@ -596 +802 @@
-
-    test)
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        ;;
-

debian/branches/upstream/current/metche.8

@@ -1 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-metche \- reducing root bus factor
-.SH "SYNOPSIS"
-.ad l
-.hy 0
-.HP 7
-
-
-
-
+
-.SH "DESCRIPTION"
-
-.PP
-
-
+
-.PP
-
-
-
+
+
+
+
-\(bu
-one or more user maintained changelog files,
-
+ 3n
-\(bu
-\&
-LP
-
+
+sp
+
-.PP
-
-
-
+
+
-\(bu
-
-
+
+
+
+
+
-\(bu
-
-
+
+
+
+
+
+
+
-\(bu
-
-
-
+
+
+
+
+
+
+
+
-.PP
-
-
+
+
+
+
+
+
-.PP
- \fI/etc/metche\&.conf\fR\&. Various settings like changelog monitoring or time between system state switches are described there\&.
-
+
+
-.SH "OPTIONS"
-
+
+
+
+
+
+
+
+
+
-.PP
-One of the following commands must be specified on the command line:
-
-
+
-\fBreport\fR
-
-
-
+
+
+
+
-\fBlist\fR
-
-
-
+
+
+
+
-\fBstabilize\fR
-
-
-
+
+
+
+
-\fBcron\fR
-
-
+
+
+
-.SH "FILES"
-
-.PP
-\&.conf\fR contains metche configuration\&.
-
+.conf\fR
+
-.PP
-
-
+
+
+
+
-.PP
-
-
+
+
+
+
-.PP
-
-
+
+
+
+
-.SH "SECURITY"
-
-.PP
-
-
+
+
+
+
-.PP