Changeset 994


Ignore:
Timestamp:
Feb 22, 2008, 11:18:11 AM (10 years ago)
Author:
jrollins
Message:

roll back putting supervise dirs in /var/lib/cereal/supervise (based
on changes to update-service)

Location:
trunk/cereal
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/cereal/debian/changelog

    r993 r994  
    11cereal (0.19-1) unstable; urgency=low
    22
    3   * add better support for non-default permissions on supervise directories.
    4     They are now created in /var/lib/cereal/supervise/<session>, and should
    5     work with update-service and persist across reboots (closes: CMRG #84)
    6   * have session destroy remove supervise directories also (closes: CMRG #85)
    7 
    8  -- Jameson Rollins <jrollins@fifthhorseman.net>  Thu, 21 Feb 2008 22:29:23 -0500
     3  * fixes to the runit update-service script now allows for setting of
     4    permissions of supervise directories at session creation, as well as
     5    saving supervise directories across reboots (closes: CMRG #84)
     6
     7 -- Jameson Rollins <jrollins@fifthhorseman.net>  Fri, 22 Feb 2008 09:23:24 -0500
    98
    109cereal (0.18-1) unstable; urgency=low
  • trunk/cereal/fs/usr/sbin/cereal-admin

    r993 r994  
    9090    chgrp -R "$LOGGROUP" "$SESSIONDIR/$SESSION/log"
    9191
    92     # create supervise directories
    93     mkdir -p "$SUPERVISEDIR/$SESSION"
    94     ln -s "$SUPERVISEDIR/$SESSION" "$SESSIONDIR/$SESSION/supervise"
    95     mkdir -p "$SUPERVISEDIR/$SESSION.log"
    96     ln -s "$SUPERVISEDIR/$SESSION.log" "$SESSIONDIR/$SESSION/log/supervise"
    9792    # make supervise directory world accessible if requested
    9893    if [ "$SUPERVISE_WORLD_ACCESSIBLE" = 'yes' ] ; then
    99         chmod 0755 "$SUPERVISEDIR/$SESSION"
    100         chmod 0755 "$SUPERVISEDIR/$SESSION.log"
     94        mkdir -p -m 0755 "$SESSIONDIR/$SESSION/supervise"
     95        mkdir -p -m 0755 "$SESSIONDIR/$SESSION/log/supervise"
    10196    fi
    10297
     
    233228    local SESSION="$1"
    234229    rm -rf "$SESSIONDIR/$SESSION"
    235     rm -rf "$SUPERVISEDIR/$SESSION"
    236     rm -rf "$SUPERVISEDIR/$SESSION.log"
    237230}
    238231export -f destroy_session
  • trunk/cereal/fs/usr/share/cereal/common

    r991 r994  
    1313export ETC="/etc/cereal"
    1414export SESSIONDIR="/var/lib/cereal/sessions"
    15 export SUPERVISEDIR="/var/lib/cereal/supervise"
    1615export ERR=0
    1716##################################################
     
    107106export -f is_running
    108107
    109 # check if user can control session
    110 # is_controllable SESSION
    111 is_controllable() {
    112     test -w "$SESSIONDIR/$1/supervise/control"
    113     # should this instead be something like this?:
    114     #sv ignore "cereal.$SESSION"
    115 }
    116 export -f is_controllable
    117 
    118108# can_attach SESSION [USER]
    119109can_attach() {
Note: See TracChangeset for help on using the changeset viewer.