Changeset b7ab9d0


Ignore:
Timestamp:
Jun 29, 2010, 7:18:31 PM (14 years ago)
Author:
Jessica B. Hamrick <jhamrick@…>
Branches:
debian
Children:
bdfed5d
Parents:
354a53e (diff), b77c92c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
git-author:
Jessica B. Hamrick <jhamrick@…> (06/29/10 19:18:31)
git-committer:
Jessica B. Hamrick <jhamrick@…> (06/29/10 19:18:31)
Message:

Merge branch 'master' into debian

Files:
29 added
4 deleted
5 edited

Legend:

Unmodified
Added
Removed

  • queue/lib/build-gutenbach-queue

    r6157f97 r8b676cb  
    11#!/bin/bash
    22
    3 if [ -e /var/run/gutenbach/current_queue_temp ]; then
    4     rm /var/run/gutenbach/current_queue_temp
     3if [ -e /tmp/gutenbach/current_queue_temp ]; then
     4    rm /tmp/gutenbach/current_queue_temp
    55fi
    66
    77while true; do
    88    time=$(date)
    9     echo "This is a work in progress!  Please send bugs to jhamrick." >> /var/run/gutenbach/current_queue_temp
    10     echo "" >> /var/run/gutenbach/current_queue_temp
    11     echo "As of $time:" >> /var/run/gutenbach/current_queue_temp
    12     echo "" >> /var/run/gutenbach/current_queue_temp
    13     /usr/lib/gutenbach/queue/queue >> /var/run/gutenbach/current_queue_temp
    14     mv /var/run/gutenbach/current_queue_temp /var/run/gutenbach/current_queue
    15     chmod ugoa+r /var/run/gutenbach/current_queue
     9    echo "This is a work in progress!  Please send bugs to jhamrick." >> /tmp/gutenbach/current_queue_temp
     10    echo "" >> /tmp/gutenbach/current_queue_temp
     11    echo "As of $time:" >> /tmp/gutenbach/current_queue_temp
     12    echo "" >> /tmp/gutenbach/current_queue_temp
     13    /usr/lib/gutenbach/queue/queue >> /tmp/gutenbach/current_queue_temp
     14    mv /tmp/gutenbach/current_queue_temp /tmp/gutenbach/current_queue
     15    chmod ugoa+r /tmp/gutenbach/current_queue
    1616done

  • queue/lib/view-gutenbach-queue

    r30beeab r8b676cb  
    11#!/bin/bash
    22
    3 daemon --running --name gutenbach-queue -F /var/run/gutenbach/gutenbach-queue.pid
     3daemon --running --name gutenbach-queue -F /tmp/gutenbach/gutenbach-queue.pid
    44if [ "$?" == 0 ]; then
    55    setterm -blank 0
    6     watch -t -n 1 cat /var/run/gutenbach/current_queue
     6    watch -t -n 1 cat /tmp/gutenbach/current_queue
    77else
    88    echo "The gutenbach queue daemon is not running.  Please start it at /etc/init.d/gutenbach-queue."

  • server/inst/cups-set-perms

    r30beeab r25df647  
    88
    99    conffile="/etc/cups/cupsd.conf"
    10     mv "$conffile" "$conffile.bak"
     10    mv "$conffile" "$conffile.gutenbach-orig"
    1111    touch "$conffile"
    1212
    13     while read line; do
    14         listen_localhost=$(echo "$line" | grep '^Listen localhost' || true)
    15         if [ -n "$listen_localhost" ]; then
    16             echo "#GUTENBACH$line" >> "$conffile"
    17         else
    18             root_location=$(echo "$line" | grep '^<Location />$' || true)
    19             if [ -n "$root_location" ]; then
    20                 echo "<Location />" >> "$conffile"
    21                 echo "Allow from All # added by Gutenbach" >> "$conffile"
    22             else
    23                 echo "$line" >> "$conffile"
    24             fi
    25         fi
     13    cat >> "$conffile" <<EOF
     14#
     15# This cupsd.conf was generated by the Gutenbach music spooler
     16#
    2617
    27     done < "$conffile.bak"
    28     rm "$conffile.bak"
     18# Log general information in error_log - change "info" to "debug" for
     19# troubleshooting...
     20LogLevel warning
    2921
    30     cat >> "$conffile" <<EOF
    31 # Begin configurations for gutenbach
     22# Administrator user group...
     23SystemGroup lpadmin
     24Group audio
    3225
    33 Group audio
     26Listen /var/run/cups/cups.sock
    3427Listen *
     28
    3529ServerAlias *
     30
     31# Default authentication type, when authentication is required...
     32DefaultAuthType Basic
     33
     34# Restrict access to the server...
     35<Location />
     36Allow from All
     37Order deny,allow
     38</Location>
     39
     40# Restrict access to the admin pages...
     41<Location /admin>
     42Encryption Required
     43Order deny,allow
     44</Location>
     45
     46# Restrict access to configuration files...
     47<Location /admin/conf>
     48AuthType Default
     49Require user @SYSTEM
     50Order deny,allow
     51</Location>
     52
     53# Set the default printer/job policies...
     54<Policy default>
     55# Job-related operations must be done by the owner or an administrator...
     56<Limit Send-Document Send-URI Hold-Job Release-Job Restart-Job Set-Job-Attributes Create-Job-Subscription Renew-Subscription Cancel-Subscription Get-Notifications Reprocess-Job Cancel-Current-Job Suspend-Current-Job Resume-Job CUPS-Move-Job>
     57Allow from All
     58Order deny,allow
     59</Limit>
     60
     61# All administration operations require an administrator to authenticate...
     62<Limit CUPS-Add-Modify-Printer CUPS-Delete-Printer CUPS-Add-Modify-Class CUPS-Delete-Class CUPS-Set-Default>
     63AuthType Default
     64Require user @SYSTEM
     65Order deny,allow
     66</Limit>
     67
     68# All printer operations require a printer operator to authenticate...
     69<Limit Pause-Printer Resume-Printer Enable-Printer Disable-Printer Pause-Printer-After-Current-Job Hold-New-Jobs Release-Held-New-Jobs Deactivate-Printer Activate-Printer Restart-Printer Shutdown-Printer Startup-Printer Promote-Job Schedule-Job-After CUPS-Accept-Jobs CUPS-Reject-Jobs>
     70AuthType Default
     71Require user @SYSTEM
     72Order deny,allow
     73</Limit>
     74
     75<Limit All>
     76Order deny,allow
     77</Limit>
     78</Policy>
    3679
    3780<Location /printers/$printername>
    … …  
    4184    </Limit>
    4285
    43     Order Deny, Allow
     86    Order deny,allow
    4487    Allow from All
    4588</Location>
    46 
    47 # End configurations for gutenbach
    4889EOF
    4990

  • server/rm/cups-revert-perms

    r30beeab rb77c92c  
    44conffile="/etc/cups/cupsd.conf"
    55
    6 mv "$conffile" "$conffile.bak"
    7 touch "$conffile"
    8 sed '/# Begin configurations for gutenbach/,/# End configurations for gutenbach/ d' < "$conffile.bak" > "$conffile"
    9 
    10 mv "$conffile" "$conffile.bak"
    11 touch "$conffile"
    12 while read line; do
    13     listen_localhost=$(echo "$line" | grep '^#GUTENBACH' || true)
    14     if [ -n "$listen_localhost" ]; then
    15         echo "$(echo $line | sed s/#GUTENBACH//)" >> "$conffile"
    16     else
    17         root_location=$(echo "$line" | grep '^Allow from All # added by Gutenbach$' || true)
    18         if [ -z "$root_location" ]; then
    19             echo "$line" >> "$conffile"
    20         fi
    21     fi
    22 
    23 done < "$conffile.bak"
    24 
    25 rm "$conffile.bak"
     6if [ -e "$conffile.gutenbach-orig" ]; then
     7    mv "$conffile.gutenbach-orig" "$conffile"
     8fi

  • .gitignore

    r323f614 r1d7e681  
    11*~
     2debian/files
     3debian/*.debhelper
     4debian/*.substvars
     5debian/*.debhelper.log
     6debian/gutenbach/
     7debian/gutenbach-client/
     8debian/gutenbach-queue/
     9debian/gutenbach-remctl/
     10debian/gutenbach-server/
     11debian/stamp-makefile-build
     12debian/tmp/
    213client/bin/*.1.gz
Note: See TracChangeset for help on using the changeset viewer.