Changeset 896


Ignore:
Timestamp:
05/22/13 12:44:21 (10 years ago)
Author:
ramonb
Message:

debian/control:

  • depend on Ganglia 3.3.8

debian/*.postinst:

  • (de)configure is actually called on upgrade
  • changed upgrade logic to check if $2 is empty

debian/jobmonarch-webfrontend.prerm:

  • only print warning upon removal

debian/jobmonarch-jobmond.prerm, debian/jobmonarch-jobarchived.prerm:

  • only disable runlevel symlinks on removal
Location:
branches/1.0/debian
Files:
7 edited
1 moved

Legend:

Unmodified
Added
Removed

  • branches/1.0/debian/control

    r890 r896  
    1010Architecture: all
    1111Essential: no
    12 Depends: ${python:Depends} (>=2.3), ganglia-monitor (>=3.0.1)
     12Depends: ${python:Depends} (>=2.3), ganglia-monitor (>=3.3.8)
    1313Description: Job Monitoring Daemon
    1414 Job-Monarch is a set of tools to monitor and optionally archive (batch) job
    … …  
    2121Architecture: all
    2222Essential: no
    23 Depends: ${python:Depends} (>=2.3), gmetad (>=3.0.1), rrdtool (>=1.0), postgresql (>= 8.1.22), python-rrdtool, python-psycopg2, jobmonarch-webfrontend
     23Depends: ${python:Depends} (>=2.3), gmetad (>=3.3.8), rrdtool (>=1.0), postgresql (>= 8.1.22), python-rrdtool, python-psycopg2, jobmonarch-webfrontend
    2424Description: Job Archiving Daemon
    2525 Job-Monarch is a set of tools to monitor and optionally archive (batch) job
    … …  
    3535Architecture: all
    3636Essential: no
    37 Depends: php5, php5-gd (>= 2.0), php5-pgsql (>= 4.0.0), ganglia-webfrontend (>=3.1.7)
     37Depends: php5, php5-gd (>= 2.0), php5-pgsql (>= 4.0.0), ganglia-webfrontend (>=3.3.8)
    3838Description: Job MonArch's Web Frontend
    3939 Job-Monarch is a set of tools to monitor and optionally archive (batch) job

  • branches/1.0/debian/jobmonarch-jobarchived.postinst

    r872 r896  
    55set -e
    66
    7 case "$1" in
    8     configure)
    9         # Only on install (not during upgrade)
     7if [ -z "$2" ]
     8then
     9    # Only on install (not during upgrade)
    1010
    11         if [ -x /etc/init.d/jobarchived ]
    12         then
    13             update-rc.d -f jobarchived defaults
    14         fi
     11    if [ -x /etc/init.d/jobarchived ]
     12    then
     13        update-rc.d -f jobarchived defaults
     14    fi
    1515
    16         echo ""
    17         echo "Additional manual changes are required to setup jobarchived:"
    18         echo ""
    19         echo "1) Edit /etc/jobarchived.conf to reflect your local settings and setup:"
    20         echo "   - ARCHIVE_DATASOURCES and ARCHIVE_PATH"
    21         echo ""
    22         echo "2) Create a 'jobarchive' database and create jobarchived's tables:"
    23         echo "   - createdb jobarchive"
    24         echo "   - psql -f /usr/share/jobarchived/job_dbase.sql jobarchive"
    25         echo "   - Update /var/lib/pgsql/data/pg_hba.conf by adding the following lines:"
    26         echo "     local   jobarchive      jobarchive                              trust"
    27         echo "     host    jobarchive      jobarchive      127.0.0.1/32            trust"
    28         echo "     host    jobarchive      jobarchive      ::1/128                 trust"
    29         echo "   - Restart the postgresql service"
    30         echo ""
    31 
    32         ;;
    33     *)
    34         ;;
    35 esac
     16    echo ""
     17    echo "Additional manual changes are required to setup jobarchived:"
     18    echo ""
     19    echo "1) Edit /etc/jobarchived.conf to reflect your local settings and setup:"
     20    echo "   - ARCHIVE_DATASOURCES and ARCHIVE_PATH"
     21    echo ""
     22    echo "2) Create a 'jobarchive' database and create jobarchived's tables:"
     23    echo "   - createdb jobarchive"
     24    echo "   - psql -f /usr/share/jobarchived/job_dbase.sql jobarchive"
     25    echo "   - Update /var/lib/pgsql/data/pg_hba.conf by adding the following lines:"
     26    echo "     local   jobarchive      jobarchive                              trust"
     27    echo "     host    jobarchive      jobarchive      127.0.0.1/32            trust"
     28    echo "     host    jobarchive      jobarchive      ::1/128                 trust"
     29    echo "   - Restart the postgresql service"
     30    echo ""
     31else
     32    # This is a upgrade
     33    :
     34fi
    3635
    3736exit 0

  • branches/1.0/debian/jobmonarch-jobarchived.prerm

    r869 r896  
    66
    77case "$1" in
    8     remove|deconfigure)
     8    deconfigure)
     9        /etc/init.d/jobarchived stop || true
     10        ;;
     11    remove)
    912        # Only on removal (not during upgrade)
    1013        /etc/init.d/jobarchived stop || true

  • branches/1.0/debian/jobmonarch-jobmond.postinst

    r891 r896  
    55set -e
    66
    7 case "$1" in
    8     configure)
    9         # Only on install (not during upgrade)
     7if [ -z "$2" ]
     8then
     9    # Only on install (not during upgrade)
    1010
    11         if [ -x /etc/init.d/jobmond ]
    12         then
    13             update-rc.d -f jobmond defaults
    14         fi
     11    if [ -x /etc/init.d/jobmond ]
     12    then
     13        update-rc.d -f jobmond defaults
     14    fi
    1515
    16         echo ""
    17         echo "Additional manual changes are required to setup jobmond:"
    18         echo ""
    19         echo "1) Edit /etc/jobmond.conf to reflect your local settings and setup:"
    20         echo "   - BATCH_API: pbs, slurm, sge (experimental), lsf (experimental)"
    21         echo "2) Install the python interface to the selected batch queuing system"
    22         echo "   - pbs-python (for pbs or torque)"
    23         echo "   - python-pyslurm (for slurm)"
    24         echo "   - pythongrid (for sge)"
    25         echo "   - python-pylsf (for lsf)"
    26         echo ""
    27 
    28         ;;
    29     *)
    30         ;;
    31 esac
     16    echo ""
     17    echo "Additional manual changes are required to setup jobmond:"
     18    echo ""
     19    echo "1) Edit /etc/jobmond.conf to reflect your local settings and setup:"
     20    echo "   - BATCH_API: pbs, slurm, sge (experimental), lsf (experimental)"
     21    echo "2) Install the python interface to the selected batch queuing system"
     22    echo "   - pbs-python (for pbs or torque)"
     23    echo "   - python-pyslurm (for slurm)"
     24    echo "   - python-pylsf (for lsf)"
     25    echo ""
     26else
     27    # This is a upgrade
     28    :
     29fi
    3230
    3331exit 0

  • branches/1.0/debian/jobmonarch-jobmond.prerm

    r869 r896  
    66
    77case "$1" in
    8     remove|deconfigure)
     8    deconfigure)
     9        /etc/init.d/jobmond stop || true
     10        ;;
     11    remove)
    912        # Only on removal (not during upgrade)
    1013        /etc/init.d/jobmond stop || true

  • branches/1.0/debian/jobmonarch-webfrontend.postinst

    r886 r896  
    11#!/bin/sh
    22
    3 echo "Make sure to set your Ganglia template to job_monarch now"
    4 echo ""
    5 echo "In your Ganglia conf.php, set this line:"
    6 echo "\$template_name = \"job_monarch\";"
     3PATH=/bin:/sbin:/usr/bin:/usr/sbin
     4
     5set -e
     6
     7if [ -z "$2" ]
     8then
     9    # Only on install (not upgrade)
     10    echo "Make sure to set your Ganglia template to job_monarch now"
     11    echo ""
     12    echo "In your Ganglia conf.php, set this line:"
     13    echo "\$template_name = \"job_monarch\";"
     14else
     15    # This is a upgrade
     16    :
     17fi
     18
     19exit 0

  • branches/1.0/debian/jobmonarch-webfrontend.prerm

    r893 r896  
    11#!/bin/sh
    22
    3 echo "Dont forget to set your Ganglia template back to default"
     3PATH=/bin:/sbin:/usr/bin:/usr/sbin
     4
     5set -e
     6
     7case "$1" in
     8    remove)
     9        # Only on removal (not during upgrade)
     10        echo "Dont forget to set your Ganglia template back to default"
     11        ;;
     12    *)
     13        ;;
     14esac
     15
     16exit 0

  • branches/1.0/debian/jobmonarch.postinst

    r871 r896  
    55set -e
    66
    7 case "$1" in
    8     configure)
    9         # Only on install (not during upgrade)
    10         echo "Generating random password and updating apropriate files"
    11         # Generate a 8 char password for the database:
    12         export DB_PASSWD=$(tr -dc A-Za-z0-9_< /dev/urandom |head -c 8 | xargs)
    13         # Set the password in the SQL script
    14         sed -i -e '/^.*modify me:.*$/d' -e 's/^-- CREATE/CREATE/g' -e "s/'';/'$DB_PASSWD';/g" %{_datadir}/jobarchived/job_dbase.sql
    15         # Set the password in the jobarchived config.
    16         sed -i -e "s/^#JOB_SQL_PASSWORD.*$/JOB_SQL_PASSWORD\t\t: $DB_PASSWD/g" %{_sysconfdir}/jobarchived.conf
    17         # Set the password in the ganglia conf.php
    18         sed -i -e "s|^//\$JOB_ARCHIVE_SQL_PASSWORD.*|\$JOB_ARCHIVE_SQL_PASSWORD = \"$DB_PASSWD\"|g" %{gangliaaddonsdir}/job_monarch/conf.php
    19         ;;
    20     *)
    21         ;;
    22 esac
     7if [ -z "$2" ]
     8then
     9    # Only on install (not during upgrade)
     10    echo "Generating random password and updating apropriate files"
     11    # Generate a 8 char password for the database:
     12    export DB_PASSWD=$(tr -dc A-Za-z0-9_< /dev/urandom |head -c 8 | xargs)
     13    # Set the password in the SQL script
     14    sed -i -e '/^.*modify me:.*$/d' -e 's/^-- CREATE/CREATE/g' -e "s/'';/'$DB_PASSWD';/g" %{_datadir}/jobarchived/job_dbase.sql
     15    # Set the password in the jobarchived config.
     16    sed -i -e "s/^#JOB_SQL_PASSWORD.*$/JOB_SQL_PASSWORD\t\t: $DB_PASSWD/g" %{_sysconfdir}/jobarchived.conf
     17    # Set the password in the ganglia conf.php
     18    sed -i -e "s|^//\$JOB_ARCHIVE_SQL_PASSWORD.*|\$JOB_ARCHIVE_SQL_PASSWORD = \"$DB_PASSWD\"|g" %{gangliaaddonsdir}/job_monarch/conf.php
     19else
     20    # this is a upgrade
     21    :
     22fi
    2323
    2424exit 0
Note: See TracChangeset for help on using the changeset viewer.