diff --git a/inventory/host_vars/vps-host b/inventory/host_vars/vps-host index bd6ad10..abbef62 100644 --- a/inventory/host_vars/vps-host +++ b/inventory/host_vars/vps-host @@ -1,13 +1,13 @@ $ANSIBLE_VAULT;1.1;AES256 -31613733363838323034373330363534363737373764653261366361376236333563646233336163 -3465613439303661373361663964343338376261323566640a373837646263383965343831306438 -62643130316366653865643438343630306439326431396339623635363630343164366530373464 -3736333430616261320a376138643533393365326330316634393437393763363566373239626532 -61323331633030316438313563616164366335643331393536666134653339363639393033633935 -34616439383165633035373764386439653336383837653933356439363866373432303364353864 -65653439353538376633653666643765333730363634383361346137623432343939346266383362 -34373638356462353066623930653766353331353936656133636230613264353933616161643139 -64626639343863373933633963633861333739396361323636303535376336663832326261383535 -64623266653562393664323330366564643437383532663163386535643835653362346339653236 -35656339396633356530333266666439373561356133343164643138353230353334373731323861 -33393432363632653333 +33646437393365646539336536336139353434326631616266313131326363666133326365386135 +3730326363313064353737623638396362373864343539650a323763333831613762313361366261 +63343630306135663463343430396537633665363335646135633030316266366561393436663565 +3034333636353864360a623139646463316465646335623561373234373138346332383735623664 +62663866343963666633643866376137613135373236663134323835636466643530656132323632 +36643964396437313030613436656538623663613663303762656665346162613063373861343334 +32646630366630333339626261363665373461353135386563393632376234366566306466633164 +34306434623263633331623732323266343035323730653039303439333635343234653536306263 +34303765333365623866656164663832393631653063393339646338333261663863313738613137 +36353532616434353333393639636135616165333630303265356438303961363464396532316632 +37636364666130366533363664646531613538313034653662613636323939396461626430363764 +35366165306233303830 diff --git a/roles/deploy-web/tasks/deploy.yml b/roles/deploy-web/tasks/deploy.yml index 3cafaa2..29014c8 100644 --- a/roles/deploy-web/tasks/deploy.yml +++ b/roles/deploy-web/tasks/deploy.yml @@ -3,12 +3,12 @@ - name: "git archive {{ item }}" local_action: module: git - repo: "https://{{ git_username | urlencode }}:{{ git_password | urlencode }}@git.valczeryba.ovh/v4l3n71n/{{ item.name }}.git" + repo: "https://{{ git_username | urlencode }}:{{ git_password | urlencode }}@git.valczeryba.ovh/v4l3n71n/{{ item.git_name }}.git" dest: "/home/valentin/src/" archive: "/tmp/{{ item.name }}.tar.gz" force: yes update: yes - when: "item.name is defined" + when: "item.git_name is defined" with_items: - "{{ project }}" @@ -16,12 +16,12 @@ - name: "Create directory " file: - path: "/var/www/{{ item.name }}" + path: "/var/www/{{ item.git_name }}" state: directory owner: www-data group: www-data mode: '500' - when: "item.name is defined" + when: "item.git_name is defined" with_items: - "{{ project }}" vars: @@ -32,12 +32,12 @@ - name: "Extract repo " unarchive: - src: "/tmp/{{ item.name }}.tar.gz" - dest: "/var/www/{{ item.name }}" + src: "/tmp/{{ item.git_name }}.tar.gz" + dest: "/var/www/{{ item.git_name }}" owner: www-data group: www-data mode: '500' - when: "item.name is defined" + when: "item.git_name is defined" with_items: - "{{ project }}" vars: diff --git a/roles/deploy-web/tasks/destroy.yml b/roles/deploy-web/tasks/destroy.yml index 6907e6f..9919252 100644 --- a/roles/deploy-web/tasks/destroy.yml +++ b/roles/deploy-web/tasks/destroy.yml @@ -1,8 +1,8 @@ - name: "Remove all directories" file: - path: "/var/www/{{ item.name }}" + path: "/var/www/{{ item.git_name }}" state: absent - when: "item.name is defined and project_name is not defined" + when: "item.git_name is defined and project_name is not defined" with_items: - "{{ project }}" vars: