[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[Git][ftp-team/dak][master] Move deploy into its own config dir, symlink common files, dont reset variables if already there



Title: GitLab

Joerg Jaspert pushed to branch master at Debian FTP Team / dak

Commits:

7 changed files:

Changes:

  • config/debian/vars
    ... ... @@ -12,15 +12,15 @@ masterdir=${base}/dak/
    12 12
     queuedir=${base}/queue/
    
    13 13
     scriptdir=${base}/scripts
    
    14 14
     
    
    15
    -configdir=${masterdir}/config/debian/
    
    15
    +export configdir=${configdir:-${masterdir}/config/debian/}
    
    16 16
     dbdir=${base}/database/
    
    17 17
     exportdir=${base}/export/
    
    18 18
     extoverridedir=${scriptdir}/external-overrides
    
    19 19
     ftpdir=${base}/ftp
    
    20 20
     incoming=${base}/public/incoming.debian.org/
    
    21 21
     indices=${ftpdir}/indices
    
    22
    -lockdir=${base}/lock/
    
    23
    -logdir=${base}/log/cron/
    
    22
    +export lockdir=${lockdir:-${base}/lock/}
    
    23
    +export logdir=${logdir:-${base}/log/cron/}
    
    24 24
     mirrordir=${base}/mirror/
    
    25 25
     
    
    26 26
     accepted=${queuedir}/accepted/
    

  • config/deploy/common
    1
    +../debian/common
    \ No newline at end of file

  • config/deploy/cronscript
    1
    +../debian/cronscript
    \ No newline at end of file

  • config/debian/deploy.functionsconfig/deploy/deploy.functions

  • config/debian/deploy.tasksconfig/deploy/deploy.tasks

  • config/debian/deploy.variablesconfig/deploy/deploy.variables

  • config/deploy/vars
    1
    +../debian/vars
    \ No newline at end of file


  • Reply to: