Projet

Général

Profil

0001-network-protocol-choice-for-git-clone-21957.patch

Emmanuel Cazenave, 19 février 2018 11:50

Télécharger (6,92 ko)

Voir les différences: 

Subject: [PATCH] network protocol choice for git clone (#21957)


 install_source.yml             | 24 +++++++++++++++++++
 inventory.yml                  |  1 +
 pip_install_source.yml         | 12 ----------
 roles/authentic/tasks/main.yml | 12 ++++------
 roles/base/tasks/main.yml      |  9 ++++++-
 roles/combo/tasks/main.yml     | 12 ++++------
 roles/hobo/tasks/main.yml      | 53 +++++++++++++-----------------------------
 roles/wcs/tasks/main.yml       | 12 ++++------
 8 files changed, 61 insertions(+), 74 deletions(-)
 create mode 100644 install_source.yml
 delete mode 100644 pip_install_source.yml
install_source.yml
1 
- name: "ssh git clone {{ repo }}"
2 
  git:
3 
    repo: "ssh://git@git.entrouvert.org/{{ repo }}.git"
4 
    dest: "{{ repo_dir }}"
5 
  when: git_ssh
6 

  		




  
  7
  
    
- name: "standard git clone {{ repo }}"

  		




  
  8
  
    
  git:

  		




  
  9
  
    
    repo: "git://repos.entrouvert.org/{{ repo }}.git"

  		




  
  10
  
    
    dest: "{{ repo_dir }}"

  		




  
  11
  
    
  when: not git_ssh

  		




  
  12
  
    

  		




  
  13
  
    
# Ugly hack to perform a simple 'pip install -e /some/source/dir'

  		




  
  14
  
    
- name: "pip install {{ repo_dir }}"

  		




  
  15
  
    
  pip:

  		




  
  16
  
    
    name: django

  		




  
  17
  
    
    version: "{{ django_version}}"

  		




  
  18
  
    
    extra_args: "-e {{ repo_dir }}"

  		




  
  19
  
    
    virtualenv: "{{ venv }}"

  		




  
  20
  
    

  		




  
  21
  
    
- name: "build {{ repo_dir }}"

  		




  
  22
  
    
  command: "{{ venv_python }} setup.py build"

  		




  
  23
  
    
  args:

  		




  
  24
  
    
    chdir: "{{ repo_dir }}"

  		












  

    
      inventory.yml
    
  





  6
  6
  
    
  vars:

  		




  7
  7
  
    
    compile_theme: true

  		




  8
  8
  
    
    django_version: 1.8.18

  		




  
  9
  
    
    git_ssh: false

  		




  9
  10
  
    
    src_dir: "/home/{{user}}/src"

  		




  10
  11
  
    
    ssl_certificate: "/etc/ssl/certs/*.local.publik.crt"

  		




  11
  12
  
    
    ssl_certificate_key: "/etc/ssl/private/*.local.publik.key"

  		












  

    
      pip_install_source.yml
    
  





  1
  
  
    
# Ugly hack to perform a simple 'pip install -e /some/source/dir'

  		




  2
  
  
    
- name: "pip install {{ source }}"

  		




  3
  
  
    
  pip:

  		




  4
  
  
    
    name: django

  		




  5
  
  
    
    version: "{{ django_version}}"

  		




  6
  
  
    
    extra_args: "-e {{ source }}"

  		




  7
  
  
    
    virtualenv: "{{venv}}"

  		




  8
  
  
    

  		




  9
  
  
    
- name: "build {{ source }}"

  		




  10
  
  
    
  command: "{{venv_python}} setup.py build"

  		




  11
  
  
    
  args:

  		




  12
  
  
    
    chdir: "{{ source }}"

  		












  

    
      roles/authentic/tasks/main.yml
    
  





  1
  1
  
    

  		




  2
  
  
    
- name: git clone authentic

  		




  3
  
  
    
  git:

  		




  4
  
  
    
    repo: ssh://git@git.entrouvert.org/authentic.git

  		




  5
  
  
    
    dest: "{{ src_dir }}/authentic"

  		




  6
  
  
    

  		




  7
  
  
    
- name: pip install authentic

  		




  8
  
  
    
  import_tasks: pip_install_source.yml

  		




  
  2
  
    
- name: source install authentic

  		




  
  3
  
    
  import_tasks: install_source.yml

  		




  9
  4
  
    
  vars:

  		




  10
  
  
    
    source: "{{src_dir}}/authentic"

  		




  
  5
  
    
    repo: "authentic"

  		




  
  6
  
    
    repo_dir: "{{ src_dir }}/authentic"

  		




  11
  7
  
    

  		




  12
  8
  
    
# FIXME: change authentic settings instead ?

  		




  13
  9
  
    
- name: install python-memcached

  		












  

    
      roles/base/tasks/main.yml
    
  





  55
  55
  
    
- name: execute getlasso

  		




  56
  56
  
    
  command: "{{venv_bin}}/getlasso.sh"

  		




  57
  57
  
    

  		




  58
  
  
    
- name: git clone

  		




  
  58
  
    
- name: ssh git clone publik-base-theme

  		




  59
  59
  
    
  git:

  		




  60
  60
  
    
    repo: ssh://git@git.entrouvert.org/publik-base-theme.git

  		




  61
  61
  
    
    dest: "{{ src_dir }}/publik-base-theme"

  		




  
  62
  
    
  when: git_ssh

  		




  
  63
  
    

  		




  
  64
  
    
- name: standard git clone publik-base-theme

  		




  
  65
  
    
  git:

  		




  
  66
  
    
    repo: git://repos.entrouvert.org/publik-base-theme.git

  		




  
  67
  
    
    dest: "{{ src_dir }}/publik-base-theme"

  		




  
  68
  
    
  when: not git_ssh

  		




  62
  69
  
    

  		




  63
  70
  
    
- name: make publik-base-theme

  		




  64
  71
  
    
  make:

  		












  

    
      roles/combo/tasks/main.yml
    
  





  1
  1
  
    

  		




  2
  
  
    
- name: Git clone combo

  		




  3
  
  
    
  git:

  		




  4
  
  
    
    repo: ssh://git@git.entrouvert.org/combo.git

  		




  5
  
  
    
    dest: "{{ src_dir }}/combo"

  		




  6
  
  
    

  		




  7
  
  
    
- name: Pip install combo

  		




  8
  
  
    
  import_tasks: pip_install_source.yml

  		




  
  2
  
    
- name: source install combo

  		




  
  3
  
    
  import_tasks: install_source.yml

  		




  9
  4
  
    
  vars:

  		




  10
  
  
    
    source: "{{src_dir}}/combo"

  		




  
  5
  
    
    repo: "combo"

  		




  
  6
  
    
    repo_dir: "{{ src_dir }}/combo"

  		




  11
  7
  
    

  		




  12
  8
  
    
- name: link to theme directory

  		




  13
  9
  
    
  file:

  		












  

    
      roles/hobo/tasks/main.yml
    
  





  1
  1
  
    

  		




  2
  
  
    
- name: git clone hobo

  		




  3
  
  
    
  git:

  		




  4
  
  
    
    repo: ssh://git@git.entrouvert.org/hobo.git

  		




  5
  
  
    
    dest: "{{ src_dir }}/hobo"

  		




  6
  
  
    
    

  		




  7
  
  
    
- name: get lasso

  		




  8
  
  
    
  command: "bash getlasso.sh"

  		




  9
  
  
    
  args:

  		




  10
  
  
    
    chdir: "{{ src_dir }}/hobo/"

  		




  11
  
  
    

  		




  12
  
  
    
- name: git clone django-mellon

  		




  13
  
  
    
  git:

  		




  14
  
  
    
    repo: ssh://git@git.entrouvert.org/django-mellon.git

  		




  15
  
  
    
    dest: "{{ src_dir }}/django-mellon"

  		




  16
  
  
    

  		




  17
  
  
    
- name: pip install django-mellon

  		




  18
  
  
    
  import_tasks: pip_install_source.yml

  		




  
  2
  
    
- name: source install django-mellon

  		




  
  3
  
    
  import_tasks: install_source.yml

  		




  19
  4
  
    
  vars:

  		




  20
  
  
    
    source: "{{src_dir}}/django-mellon"

  		




  
  5
  
    
    repo: "django-mellon"

  		




  
  6
  
    
    repo_dir: "{{ src_dir }}/django-mellon"

  		




  21
  7
  
    

  		




  22
  
  
    
- name: git clone gadjo

  		




  23
  
  
    
  git:

  		




  24
  
  
    
    repo: ssh://git@git.entrouvert.org/gadjo.git

  		




  25
  
  
    
    dest:  "{{ src_dir }}/gadjo"

  		




  26
  
  
    

  		




  27
  
  
    
- name: pip install gadjo

  		




  28
  
  
    
  import_tasks: pip_install_source.yml

  		




  
  8
  
    
- name: source install gadjo

  		




  
  9
  
    
  import_tasks: install_source.yml

  		




  29
  10
  
    
  vars:

  		




  30
  
  
    
    source: "{{src_dir}}/gadjo"

  		




  31
  
  
    

  		




  32
  
  
    
- name: git clone django-tenant-schemas

  		




  33
  
  
    
  git:

  		




  34
  
  
    
    repo: ssh://git@git.entrouvert.org/debian/django-tenant-schemas.git

  		




  35
  
  
    
    dest:  "{{ src_dir }}/django-tenant-schemas"

  		




  
  11
  
    
    repo: "gadjo"

  		




  
  12
  
    
    repo_dir: "{{ src_dir }}/gadjo"

  		




  36
  13
  
    

  		




  37
  
  
    
- name: pip install django-tenant-schemas

  		




  38
  
  
    
  import_tasks: pip_install_source.yml

  		




  
  14
  
    
- name: source install django-tenant-schemas

  		




  
  15
  
    
  import_tasks: install_source.yml

  		




  39
  16
  
    
  vars:

  		




  40
  
  
    
    source: "{{src_dir}}/django-tenant-schemas"

  		




  
  17
  
    
    repo: "debian/django-tenant-schemas"

  		




  
  18
  
    
    repo_dir: "{{ src_dir }}/django-tenant-schemas"

  		




  41
  19
  
    

  		




  42
  
  
    
- name: pip install hobo

  		




  43
  
  
    
  import_tasks: pip_install_source.yml

  		




  
  20
  
    
- name: source install hobo

  		




  
  21
  
    
  import_tasks: install_source.yml

  		




  44
  22
  
    
  vars:

  		




  45
  
  
    
    source: "{{src_dir}}/hobo"

  		




  
  23
  
    
    repo: "hobo"

  		




  
  24
  
    
    repo_dir: "{{ src_dir }}/hobo"

  		




  46
  25
  
    

  		




  47
  26
  
    
- name: hobo app setup

  		




  48
  27
  
    
  import_role:

  		












  

    
      roles/wcs/tasks/main.yml
    
  





  1
  1
  
    

  		




  2
  
  
    
- name: Git clone wcs

  		




  3
  
  
    
  git:

  		




  4
  
  
    
    repo: ssh://git@git.entrouvert.org/wcs.git

  		




  5
  
  
    
    dest: "{{ src_dir }}/wcs"

  		




  6
  
  
    

  		




  7
  2
  
    
# FIXME : clean python install should be handled directly in wcs

  		




  8
  3
  
    
- name: copy wcs requirements.txt

  		




  9
  4
  
    
  copy:

  		




  ......




  15
  10
  
    
    requirements: "{{venv}}/misc/wcs_requirements.txt"

  		




  16
  11
  
    
    virtualenv: "{{venv}}"

  		




  17
  12
  
    

  		




  18
  
  
    
- name: pip install wcs

  		




  19
  
  
    
  import_tasks: pip_install_source.yml

  		




  
  13
  
    
- name: source install wcs

  		




  
  14
  
    
  import_tasks: install_source.yml

  		




  20
  15
  
    
  vars:

  		




  21
  
  
    
    source: "{{src_dir}}/wcs"

  		




  
  16
  
    
    repo: "wcs"

  		




  
  17
  
    
    repo_dir: "{{ src_dir }}/wcs"

  		




  22
  18
  
    

  		




  23
  19
  
    
- name: "create share/wcs directory"

  		




  24
  20
  
    
  file:

  		




  25
  
  
    
-