From 42a176bd7c5c790c1000f8ce3007696aaad88e1e Mon Sep 17 00:00:00 2001 From: mpavlov Date: Sun, 29 Sep 2024 01:35:45 +0300 Subject: [PATCH] repo init --- Jenkinsfile | 2 +- roles/rproxy/tasks/main.yml | 6 ++++++ roles/rproxy/templates/docker-compose.yml.j2 | 4 +++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 70c19d7..8fa9942 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -8,7 +8,7 @@ pipeline { base64File(name: "rootca", description: "RootCA (only for 'Install Rproxy')") base64File(name: "rootca_key", description: "RootCA key (only for 'Install Rproxy')") booleanParam(name: "config_add", defaultValue: true, description: "Add config") - string(name: "rproxy_service_name", defaultValue: "", trim: true, description: "Service name (for 'Add config' job only)") + string(name: "rproxy_service_name", defaultValue: "", trim: true, description: "Service name, ex. jenkins (for 'Add config' job only)") string(name: "rproxy_service_port", defaultValue: "", trim: true, description: "Service port (for 'Add config' job only)") string(name: "rproxy_service_address", defaultValue: "", trim: true, description: "Service address (for 'Add config' job only)") diff --git a/roles/rproxy/tasks/main.yml b/roles/rproxy/tasks/main.yml index 6fc787c..2301409 100644 --- a/roles/rproxy/tasks/main.yml +++ b/roles/rproxy/tasks/main.yml @@ -51,6 +51,12 @@ path: "{{ rproxy_dir }}/sites" state: directory + - name: Create repo dir + ansible.builtin.file: + path: "{{ rproxy_dir }}/repo" + state: directory + mode: 0777 + - name: Create certs dir ansible.builtin.file: path: "{{ rproxy_dir }}/certs" diff --git a/roles/rproxy/templates/docker-compose.yml.j2 b/roles/rproxy/templates/docker-compose.yml.j2 index c424260..1bd02d9 100644 --- a/roles/rproxy/templates/docker-compose.yml.j2 +++ b/roles/rproxy/templates/docker-compose.yml.j2 @@ -9,6 +9,8 @@ services: - {{ rproxy_dir }}/nginx.conf:/etc/nginx/nginx.conf - {{ rproxy_dir }}/sites:/etc/nginx/sites - {{ rproxy_dir }}/certs:/etc/nginx/certs + - {{ rproxy_dir }}/certs:/repo ports: - 443:443 - - 80:80 \ No newline at end of file + - 80:80 + - 9000:9000 \ No newline at end of file