Projet

Général

Profil

0001-debian-deprecate-usage-of-etc-init.d-authentic2-mana.patch

Benjamin Dauvergne, 20 mai 2016 17:22

Télécharger (7,07 ko)

Voir les différences: 

Subject: [PATCH] debian: deprecate usage of /etc/init.d/authentic2 manage
 (fixes #11008)

adding a command to /etc/init.d/authentic2 was a bad idea anyway and would
force us to use sudo -E so that /etc/default/authentic2 is visible from
authentic2-ctl.

Also replace cron.hourly files by cron.d files.

 debian-jessie/authentic2-ctl                     | 4 ++++
 debian-jessie/authentic2-multitenant.cron.d      | 5 +++++
 debian-jessie/authentic2-multitenant.cron.hourly | 5 -----
 debian-jessie/authentic2.cron.d                  | 6 ++++++
 debian-jessie/authentic2.cron.hourly             | 5 -----
 debian-jessie/authentic2.init                    | 8 --------
 debian-wheezy/authentic2-ctl                     | 4 ++++
 debian-wheezy/authentic2-multitenant.cron.d      | 5 +++++
 debian-wheezy/authentic2-multitenant.cron.hourly | 5 -----
 debian-wheezy/authentic2.cron.d                  | 6 ++++++
 debian-wheezy/authentic2.cron.hourly             | 5 -----
 debian-wheezy/authentic2.init                    | 8 --------
 12 files changed, 30 insertions(+), 36 deletions(-)
 create mode 100644 debian-jessie/authentic2-multitenant.cron.d
 delete mode 100644 debian-jessie/authentic2-multitenant.cron.hourly
 create mode 100644 debian-jessie/authentic2.cron.d
 delete mode 100644 debian-jessie/authentic2.cron.hourly
 create mode 100644 debian-wheezy/authentic2-multitenant.cron.d
 delete mode 100644 debian-wheezy/authentic2-multitenant.cron.hourly
 create mode 100644 debian-wheezy/authentic2.cron.d
 delete mode 100644 debian-wheezy/authentic2.cron.hourly
debian-jessie/authentic2-ctl
13 13 
    fi
14 14 
fi
15 15 

  		




  
  16
  
    
if [ -f /etc/default/authentic2 ]; then

  		




  
  17
  
    
    . /etc/default/authentic2

  		




  
  18
  
    
fi

  		




  
  19
  
    

  		




  16
  20
  
    
if [ -f /etc/authentic2/db.conf ]; then

  		




  17
  21
  
    
    . /etc/authentic2/db.conf

  		




  18
  22
  
    
fi

  		












  

    
      debian-jessie/authentic2-multitenant.cron.d
    
  





  
  1
  
    
PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin

  		




  
  2
  
    

  		




  
  3
  
    
0 * * * * authentic authentic2-multitenant-manage tenant_command clearsessions --all-tenants

  		




  
  4
  
    
5 * * * * authentic authentic2-multitenant-manage tenant_command cleanupauthentic --all-tenants

  		




  
  5
  
    
10 * * * * authentic authentic2-multitenant-manage tenant_command sync-ldap-users --all-tenants

  		












  

    
      debian-jessie/authentic2-multitenant.cron.hourly
    
  





  1
  
  
    
#!/bin/sh

  		




  2
  
  
    

  		




  3
  
  
    
authentic2-multitenant-manage tenant_command clearsessions --all-tenants

  		




  4
  
  
    
authentic2-multitenant-manage tenant_command cleanupauthentic --all-tenants

  		




  5
  
  
    
authentic2-multitenant-manage tenant_command sync-ldap-users --all-tenants

  		












  

    
      debian-jessie/authentic2.cron.d
    
  





  
  1
  
    
PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin

  		




  
  2
  
    

  		




  
  3
  
    
0 * * * * authentic authentic2-ctl clearsessions

  		




  
  4
  
    
5 * * * * authentic authentic2-ctl cleanupauthentic

  		




  
  5
  
    
10 * * * * authentic authentic2-ctl sync-ldap-users

  		




  
  6
  
    

  		












  

    
      debian-jessie/authentic2.cron.hourly
    
  





  1
  
  
    
#!/bin/sh

  		




  2
  
  
    

  		




  3
  
  
    
/usr/sbin/service authentic2 manage clearsessions

  		




  4
  
  
    
/usr/sbin/service authentic2 manage cleanupauthentic

  		




  5
  
  
    
/usr/sbin/service authentic2 manage sync-ldap-users

  		












  

    
      debian-jessie/authentic2.init
    
  





  195
  195
  
    
		;;

  		




  196
  196
  
    
	esac

  		




  197
  197
  
    
	;;

  		




  198
  
  
    
  manage)

  		




  199
  
  
    
    shift

  		




  200
  
  
    
    if [ $(id -un) != "$USER" ]; then

  		




  201
  
  
    
        sudo -u $USER -- $MANAGE_SCRIPT "$@"

  		




  202
  
  
    
    else

  		




  203
  
  
    
        $MANAGE_SCRIPT "$@"

  		




  204
  
  
    
    fi

  		




  205
  
  
    
  ;;

  		




  206
  198
  
    
  *)

  		




  207
  199
  
    
	echo "Usage: $SCRIPTNAME {start|stop|status|restart|update|reload}" >&2

  		




  208
  200
  
    
	exit 3

  		












  

    
      debian-wheezy/authentic2-ctl
    
  





  13
  13
  
    
    fi

  		




  14
  14
  
    
fi

  		




  15
  15
  
    

  		




  
  16
  
    
if [ -f /etc/default/authentic2 ]; then

  		




  
  17
  
    
    . /etc/default/authentic2

  		




  
  18
  
    
fi

  		




  
  19
  
    

  		




  16
  20
  
    
if [ -f /etc/authentic2/db.conf ]; then

  		




  17
  21
  
    
    . /etc/authentic2/db.conf

  		




  18
  22
  
    
fi

  		












  

    
      debian-wheezy/authentic2-multitenant.cron.d
    
  





  
  1
  
    
PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin

  		




  
  2
  
    

  		




  
  3
  
    
0 * * * * authentic authentic2-multitenant-manage tenant_command clearsessions --all-tenants

  		




  
  4
  
    
5 * * * * authentic authentic2-multitenant-manage tenant_command cleanupauthentic --all-tenants

  		




  
  5
  
    
10 * * * * authentic authentic2-multitenant-manage tenant_command sync-ldap-users --all-tenants

  		












  

    
      debian-wheezy/authentic2-multitenant.cron.hourly
    
  





  1
  
  
    
#!/bin/sh

  		




  2
  
  
    

  		




  3
  
  
    
authentic2-multitenant-manage tenant_command clearsessions --all-tenants

  		




  4
  
  
    
authentic2-multitenant-manage tenant_command cleanupauthentic --all-tenants

  		




  5
  
  
    
authentic2-multitenant-manage tenant_command sync-ldap-users --all-tenants

  		












  

    
      debian-wheezy/authentic2.cron.d
    
  





  
  1
  
    
PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin

  		




  
  2
  
    

  		




  
  3
  
    
0 * * * * authentic authentic2-ctl clearsessions

  		




  
  4
  
    
5 * * * * authentic authentic2-ctl cleanupauthentic

  		




  
  5
  
    
10 * * * * authentic authentic2-ctl sync-ldap-users

  		




  
  6
  
    

  		












  

    
      debian-wheezy/authentic2.cron.hourly
    
  





  1
  
  
    
#!/bin/sh

  		




  2
  
  
    

  		




  3
  
  
    
/usr/sbin/service authentic2 manage clearsessions

  		




  4
  
  
    
/usr/sbin/service authentic2 manage cleanupauthentic

  		




  5
  
  
    
/usr/sbin/service authentic2 manage sync-ldap-users

  		












  

    
      debian-wheezy/authentic2.init
    
  





  195
  195
  
    
		;;

  		




  196
  196
  
    
	esac

  		




  197
  197
  
    
	;;

  		




  198
  
  
    
  manage)

  		




  199
  
  
    
    shift

  		




  200
  
  
    
    if [ $(id -un) != "$USER" ]; then

  		




  201
  
  
    
        sudo -u $USER -- $MANAGE_SCRIPT "$@"

  		




  202
  
  
    
    else

  		




  203
  
  
    
        $MANAGE_SCRIPT "$@"

  		




  204
  
  
    
    fi

  		




  205
  
  
    
  ;;

  		




  206
  198
  
    
  *)

  		




  207
  199
  
    
	echo "Usage: $SCRIPTNAME {start|stop|status|restart|update|reload}" >&2

  		




  208
  200
  
    
	exit 3

  		




  209
  
  
    
-