From fa96ac7a7b9a886ba1f5529912d6092cbb6548cd Mon Sep 17 00:00:00 2001 From: Emmanuel Cazenave Date: Mon, 19 Feb 2018 11:46:57 +0100 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 diff --git a/install_source.yml b/install_source.yml new file mode 100644 index 0000000..3e976e6 --- /dev/null +++ b/install_source.yml @@ -0,0 +1,24 @@ +- name: "ssh git clone {{ repo }}" + git: + repo: "ssh://git@git.entrouvert.org/{{ repo }}.git" + dest: "{{ repo_dir }}" + when: git_ssh + +- name: "standard git clone {{ repo }}" + git: + repo: "git://repos.entrouvert.org/{{ repo }}.git" + dest: "{{ repo_dir }}" + when: not git_ssh + +# Ugly hack to perform a simple 'pip install -e /some/source/dir' +- name: "pip install {{ repo_dir }}" + pip: + name: django + version: "{{ django_version}}" + extra_args: "-e {{ repo_dir }}" + virtualenv: "{{ venv }}" + +- name: "build {{ repo_dir }}" + command: "{{ venv_python }} setup.py build" + args: + chdir: "{{ repo_dir }}" diff --git a/inventory.yml b/inventory.yml index 94a0171..b21aead 100644 --- a/inventory.yml +++ b/inventory.yml @@ -6,6 +6,7 @@ local: vars: compile_theme: true django_version: 1.8.18 + git_ssh: false src_dir: "/home/{{user}}/src" ssl_certificate: "/etc/ssl/certs/*.local.publik.crt" ssl_certificate_key: "/etc/ssl/private/*.local.publik.key" diff --git a/pip_install_source.yml b/pip_install_source.yml deleted file mode 100644 index 877ec25..0000000 --- a/pip_install_source.yml +++ /dev/null @@ -1,12 +0,0 @@ -# Ugly hack to perform a simple 'pip install -e /some/source/dir' -- name: "pip install {{ source }}" - pip: - name: django - version: "{{ django_version}}" - extra_args: "-e {{ source }}" - virtualenv: "{{venv}}" - -- name: "build {{ source }}" - command: "{{venv_python}} setup.py build" - args: - chdir: "{{ source }}" diff --git a/roles/authentic/tasks/main.yml b/roles/authentic/tasks/main.yml index 8f937ee..bf59b44 100644 --- a/roles/authentic/tasks/main.yml +++ b/roles/authentic/tasks/main.yml @@ -1,13 +1,9 @@ -- name: git clone authentic - git: - repo: ssh://git@git.entrouvert.org/authentic.git - dest: "{{ src_dir }}/authentic" - -- name: pip install authentic - import_tasks: pip_install_source.yml +- name: source install authentic + import_tasks: install_source.yml vars: - source: "{{src_dir}}/authentic" + repo: "authentic" + repo_dir: "{{ src_dir }}/authentic" # FIXME: change authentic settings instead ? - name: install python-memcached diff --git a/roles/base/tasks/main.yml b/roles/base/tasks/main.yml index 6124960..50ee114 100644 --- a/roles/base/tasks/main.yml +++ b/roles/base/tasks/main.yml @@ -55,10 +55,17 @@ - name: execute getlasso command: "{{venv_bin}}/getlasso.sh" -- name: git clone +- name: ssh git clone publik-base-theme git: repo: ssh://git@git.entrouvert.org/publik-base-theme.git dest: "{{ src_dir }}/publik-base-theme" + when: git_ssh + +- name: standard git clone publik-base-theme + git: + repo: git://repos.entrouvert.org/publik-base-theme.git + dest: "{{ src_dir }}/publik-base-theme" + when: not git_ssh - name: make publik-base-theme make: diff --git a/roles/combo/tasks/main.yml b/roles/combo/tasks/main.yml index 8f24a51..ba55679 100644 --- a/roles/combo/tasks/main.yml +++ b/roles/combo/tasks/main.yml @@ -1,13 +1,9 @@ -- name: Git clone combo - git: - repo: ssh://git@git.entrouvert.org/combo.git - dest: "{{ src_dir }}/combo" - -- name: Pip install combo - import_tasks: pip_install_source.yml +- name: source install combo + import_tasks: install_source.yml vars: - source: "{{src_dir}}/combo" + repo: "combo" + repo_dir: "{{ src_dir }}/combo" - name: link to theme directory file: diff --git a/roles/hobo/tasks/main.yml b/roles/hobo/tasks/main.yml index e1a5228..985712c 100644 --- a/roles/hobo/tasks/main.yml +++ b/roles/hobo/tasks/main.yml @@ -1,48 +1,27 @@ -- name: git clone hobo - git: - repo: ssh://git@git.entrouvert.org/hobo.git - dest: "{{ src_dir }}/hobo" - -- name: get lasso - command: "bash getlasso.sh" - args: - chdir: "{{ src_dir }}/hobo/" - -- name: git clone django-mellon - git: - repo: ssh://git@git.entrouvert.org/django-mellon.git - dest: "{{ src_dir }}/django-mellon" - -- name: pip install django-mellon - import_tasks: pip_install_source.yml +- name: source install django-mellon + import_tasks: install_source.yml vars: - source: "{{src_dir}}/django-mellon" + repo: "django-mellon" + repo_dir: "{{ src_dir }}/django-mellon" -- name: git clone gadjo - git: - repo: ssh://git@git.entrouvert.org/gadjo.git - dest: "{{ src_dir }}/gadjo" - -- name: pip install gadjo - import_tasks: pip_install_source.yml +- name: source install gadjo + import_tasks: install_source.yml vars: - source: "{{src_dir}}/gadjo" - -- name: git clone django-tenant-schemas - git: - repo: ssh://git@git.entrouvert.org/debian/django-tenant-schemas.git - dest: "{{ src_dir }}/django-tenant-schemas" + repo: "gadjo" + repo_dir: "{{ src_dir }}/gadjo" -- name: pip install django-tenant-schemas - import_tasks: pip_install_source.yml +- name: source install django-tenant-schemas + import_tasks: install_source.yml vars: - source: "{{src_dir}}/django-tenant-schemas" + repo: "debian/django-tenant-schemas" + repo_dir: "{{ src_dir }}/django-tenant-schemas" -- name: pip install hobo - import_tasks: pip_install_source.yml +- name: source install hobo + import_tasks: install_source.yml vars: - source: "{{src_dir}}/hobo" + repo: "hobo" + repo_dir: "{{ src_dir }}/hobo" - name: hobo app setup import_role: diff --git a/roles/wcs/tasks/main.yml b/roles/wcs/tasks/main.yml index 612cbd9..78cd34d 100644 --- a/roles/wcs/tasks/main.yml +++ b/roles/wcs/tasks/main.yml @@ -1,9 +1,4 @@ -- name: Git clone wcs - git: - repo: ssh://git@git.entrouvert.org/wcs.git - dest: "{{ src_dir }}/wcs" - # FIXME : clean python install should be handled directly in wcs - name: copy wcs requirements.txt copy: @@ -15,10 +10,11 @@ requirements: "{{venv}}/misc/wcs_requirements.txt" virtualenv: "{{venv}}" -- name: pip install wcs - import_tasks: pip_install_source.yml +- name: source install wcs + import_tasks: install_source.yml vars: - source: "{{src_dir}}/wcs" + repo: "wcs" + repo_dir: "{{ src_dir }}/wcs" - name: "create share/wcs directory" file: -- 2.16.1