Merge pull request 'ICR integration' (#51) from dev into master

Reviewed-on: https://remvpn.olssonul.com/iac/rproxy/pulls/51

Jenkinsfile

@@ -10,13 +10,13 @@ pipeline {
         ansiColor('xterm')
         timestamps()
     }
+    environment {
+        INFRA_CONFIG_REPO = credentials("INFRA_CONFIG_REPO")
+    }
     parameters {
-        string(name: "target_host", defaultValue: "", trim: true, description: "Target host")
+        choice(name: "infra", choices: ['prod', 'dev'], description: "Select infrastructure type")
-        booleanParam(name: "rproxy_install", defaultValue: true, description: "Install Rproxy")
+        choice(name: "repo_location", choices: ['local', 'remote'], description: "Select repository location")
-        booleanParam(name: "config_add", defaultValue: true, description: "Add config")
+        string(name: "target_host", defaultValue: "", trim: true, description: "Target host for rproxy installation")
-        string(name: "rproxy_service_name", defaultValue: "", trim: true, description: "Service name (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)")
         booleanParam(name: 'update_job', defaultValue: false, description: 'Update job, free run, no changes')
     }
     stages {
@@ -43,41 +43,25 @@ pipeline {
                 }
             }
         }
-        stage('Install Rproxy') {
+        stage('Get environment') {
-            when {
-                expression {
-                    return params.rproxy_install
-                }
-            }
             steps {
                 script {
-                    withCredentials([
+                    dir('infra-config') {
-                        sshUserPrivateKey(credentialsId: 'JENKINS_DEPLOYER_KEY', keyFileVariable: 'SSH_KEY'), 
+                        git url: env.INFRA_CONFIG_REPO,
-                        usernamePassword(credentialsId:'JENKINS_DEPLOYER_PASS', usernameVariable: 'username', passwordVariable: 'password')
+                            branch: params.infra,
-                        ]) {
+                            credentialsId: 'JENKINS_GIT_ACCESS'
-                        wrap([$class: 'MaskPasswordsBuildWrapper', varPasswordPairs: [[password: env.password]]]) {
+
-                            wrap([$class: 'AnsiColorBuildWrapper', colorMapName: "xterm"]) {
+                        sh "ansible-playbook render.yml"
-                                ansiblePlaybook(
+                        infraVars = readYaml file: "./global.yml"
-                                    playbook: 'rproxy.yml',
-                                    inventory: 'hosts.ini',
-                                    tags: 'install',
-                                    colorized: true,
-                                    extras: '--private-key ${SSH_KEY} -e "ansible_user=${username} ansible_password=${password} rproxy_service_name=${rproxy_service_name} rproxy_service_port=${rproxy_service_port} rproxy_service_address=${rproxy_service_address}"'
-                                )
-                            }                            
-                        }
                     }
                 }
             }
         }
-        stage('Add config') {
+        stage('Install Rproxy') {
-            when {
-                expression {
-                    return params.config_add
-                }
-            }
             steps {
                 script {
+                    images_repo_url = infraVars["${params.repo_location}"]["repos"]["registry_url"]
+
                     withCredentials([
                         sshUserPrivateKey(credentialsId: 'JENKINS_DEPLOYER_KEY', keyFileVariable: 'SSH_KEY'), 
                         usernamePassword(credentialsId:'JENKINS_DEPLOYER_PASS', usernameVariable: 'username', passwordVariable: 'password')
@@ -87,11 +71,15 @@ pipeline {
                                 ansiblePlaybook(
                                     playbook: 'rproxy.yml',
                                     inventory: 'hosts.ini',
-                                    tags: 'add_config',
                                     colorized: true,
-                                    extras: '--private-key ${SSH_KEY} -e "ansible_user=${username} ansible_password=${password} rproxy_service_name=${rproxy_service_name} rproxy_service_port=${rproxy_service_port} rproxy_service_address=${rproxy_service_address}"'
+                                    extras: "--private-key ${SSH_KEY}",
+                                    extraVars: [
+                                        ansible_user: [value: "${username}", hidden: false],
+                                        ansible_password: [value: "${password}", hidden: true],
+                                        image_repo: [value: "${images_repo_url}", hidden: false]
+                                    ]
                                 )
-                            }  
+                            }                            
                         }
                     }
                 }

README.md

@@ -1,46 +1,83 @@
-# PROXY
+# Rproxy
 
-## Content
+## Description
-* Reverse proxy
-* HTTPS file share
-* Docker-registry
 
-## Installation
+This job handles Nginx 1.29 installation and includes the following components:
-```yml
-target_host: Enter FQDN or IP Address of target host
-rproxy_install: Install rproxy, https repo and docker-registry if checked
-config_add: Will config be created
 
-rproxy_service_name: Server/service name without domain suffix
+- **Nginx as Reverse Proxy**:  
-rproxy_service_port: Port to redirect the request to 
+  - Acts as a reverse proxy for secure traffic routing  
-rproxy_service_address: Address to redirect the request to 
+  - Supports SSL termination  
 
-Example:
+- **HTTP Repository**:  
-domain: olsson.ul
+  - Provides a base for hosting and managing web content  
-jenkins_host: http://10.10.10.1:8080/
 
-rproxy_service_name: jenkins
+- **Infrastructure**:  
-rproxy_service_port: 8080
+  - ✅ Includes Podman installation  
-rproxy_service_address: 10.10.10.1
+  - ✅ Contains a management job for proxy configuration  
+    - Allows seamless addition of new services (e.g., enabling SSL access to Jenkins)  
 
-# After adding alias jenkins.olsson.ul => rproxy.olsson.ul
+### Nginx as Reverse Proxy
-result_address: https://jenkins.olsson.ul/
-```
 
-## Reverse Proxy
+**Setup**:  
-Allows redirecting requests based on fqdn to the required address and ports with ssl certificate substitution
+- Installs Nginx container in Podman environment  
 
-## HTTPS repository
+**Configuration Structure**:  
-Would be installed with rproxy service. Hosted on port 9000. \
+- **Root directory**: `/opt/rproxy`  
-Files should be stored in /opt/rproxy/repo/ to be shared.
+  - **Main config**: `/opt/rproxy/nginx.conf`  
+  - **Site-specific configs**: `/opt/rproxy/sites/*.conf`  
+  - **Certificates**: `/opt/rproxy/certs/` (stores unique certificates for each connected site)  
 
-## Docker-registry
+**Operation**:  
-Would be installed with rproxy service. Hosted on port 5000.
+- Listens on `https://$hostname/`  
-Images would be stored in /opt/dockerrepo/repo/. Uses SSL so you should have trust with root certificate. \
+- Maps incoming requests to `/opt/rproxy/sites/$hostname.conf`  
-Install trust with root certificate
+- Forwards traffic to `https://$hostname:[port]` with SSL termination  
-How to store image:
+
+**Entrypoint**:  
+- Proxy endpoint: `https://$hostname/`  
+
+
+### HTTP Repository
+
+**Configuration**:  
+- A `repo.conf` file is added to the `/opt/rproxy/sites/` directory  
+- **DAVFS** functionality is enabled for file management  
+- **Data storage path**: `/opt/repodata`  
+
+**Access Point**:  
+- Proxy endpoint: `https://localhost:9000/`  
+
+#### Example Usage
+
+Upload a file to the repository using `curl`:
 ```bash
-# After image build
+# Upload example: kafka_4.1.tar to /podman/kafka/4.1/
-docker tag $image $registry_address:5000/$image
+curl -T kafka_4.1.tar https://rproxy.olsson.ul:9000/podman/kafka/4.1/kafka_4.1.tar
-docker push $registry_address:5000/$image
 ```
+
+## Add configuration via management job
+Import management/AddService.groovy to Jenkins
+
+To integrate `http://jenkins-master.olsson.ul:8080` with the SSL proxy, configure these parameters:
+
+- **target_host**: Host with rproxy installed  
+- **rproxy_service_name**: Service identifier (e.g., `jenkins`)  
+- **rproxy_service_port**: Port (e.g., `8080`)  
+- **rproxy_service_address**: Address (e.g., `jenkins-master.olsson.ul` or `10.10.10.1`)  
+
+✅ **Result**:  
+`https://jenkins.olsson.ul/` will securely route to `http://jenkins-master.olsson.ul:8080`.  
+ 
+CNAME configuration (`jenkins.olsson.ul → rproxy`) is automatically handled during deployment in FreeIPA.
+
+## Software Requirements
+* OS - AlmaLinux 10
+* FreeIPA domain (for certificates request)
+
+## Jenkins credentials
+* JENKINS_DEPLOYER_PASS (domain)
+* JENKINS_DEPLOYER_KEY (domain)
+
+## Jenkins paramethers
+* target_hosts - is basic inventory line for ansible
+* images_repo_url - image registry with nginx repository
+* update_job - download changes from git and finish job

addconfig.yml

@@ -0,0 +1,19 @@
+---
+- hosts: all
+  become: yes
+  
+  vars_prompt:
+    - name: rproxy_service_name
+      prompt: Enter service for rproxy
+      private: false
+
+    - name: rproxy_service_port
+      prompt: Enter service for rproxy
+      private: false
+
+    - name: rproxy_service_address
+      prompt: Enter service for rproxy
+      private: false
+
+  roles:
+    - addconfig

ansible.cfg

@@ -2,4 +2,7 @@
 hostfile = hosts.ini
 host_key_checking = false
 interpreter_python = /usr/bin/python3
-forks = 30
+forks = 30
+
+[ssh_connection]
+pipelining = true

management/AddService.groovy

@@ -0,0 +1,80 @@
+pipeline {
+    agent any
+    options {
+        buildDiscarder logRotator (
+            numToKeepStr: '5',
+            daysToKeepStr: '7',
+            artifactNumToKeepStr: '10',
+            artifactDaysToKeepStr: '7'
+        )
+        ansiColor('xterm')
+        timestamps()
+    }
+    parameters {
+        string(name: "target_host", defaultValue: "", trim: true, description: "Target host with rproxy installed")
+        string(name: "rproxy_service_name", defaultValue: "", trim: true, description: "Service name (ex. jenkins)")
+        string(name: "rproxy_service_port", defaultValue: "", trim: true, description: "Service port (ex. 8080)")
+        string(name: "rproxy_service_address", defaultValue: "", trim: true, description: "Service address (ex. jenkins-master.olsson.ul)")
+        booleanParam(name: 'update_job', defaultValue: false, description: 'Update job, free run, no changes')
+    }
+    stages {
+        stage('Update Job') {
+            when {
+                expression {
+                    return params.update_job
+                }
+            }
+            steps {
+                script {
+                    currentBuild.getRawBuild().getExecutor().interrupt(Result.SUCCESS)
+                    sleep(1)
+                }
+            }
+        }
+        stage('Prepare inventory') {
+            steps {
+                script {
+                    def hostsFile = new File("${WORKSPACE}/hosts.ini")
+                    hostsFile.append('[all]')
+                    hostsFile.append('\n' + params.target_host)
+                    println hostsFile.getText('UTF-8')
+                }
+            }
+        }
+        stage('Add config') {
+            steps {
+                script {
+                    withCredentials([
+                        sshUserPrivateKey(credentialsId: 'JENKINS_DEPLOYER_KEY', keyFileVariable: 'SSH_KEY'), 
+                        usernamePassword(credentialsId:'JENKINS_DEPLOYER_PASS', usernameVariable: 'username', passwordVariable: 'password')
+                        ]) {
+                        wrap([$class: 'MaskPasswordsBuildWrapper', varPasswordPairs: [[password: env.password]]]) {
+                            wrap([$class: 'AnsiColorBuildWrapper', colorMapName: "xterm"]) {
+                                dir("${env.WORKSPACE}") {
+                                    ansiblePlaybook(
+                                        playbook: 'addconfig.yml',
+                                        inventory: 'hosts.ini',
+                                        colorized: true,
+                                        extras: '''--private-key ${SSH_KEY} 
+                                        -e "ansible_user=${username} 
+                                        ansible_password=${password} 
+                                        rproxy_service_name=${rproxy_service_name} 
+                                        rproxy_service_port=${rproxy_service_port} 
+                                        rproxy_service_address=${rproxy_service_address}"'''
+                                    )
+                                }
+                            }                            
+                        }
+                    }
+                }
+            }
+        }
+    }
+    post {
+        always {
+            cleanWs(patterns: [
+                [pattern: 'hosts.ini', type: 'INCLUDE']
+            ])
+        }
+    }
+}

roles/addconfig/tasks/addconfig.yml

@@ -0,0 +1,5 @@
+---
+- name: Copy server.conf
+  ansible.builtin.template:
+    src: templates/server.conf.j2
+    dest: "{{ rproxy_dir }}/sites/{{  rproxy_service_name  }}.conf"

roles/addconfig/tasks/certificates.yml

@@ -0,0 +1,83 @@
+---
+- name: Create CNAME dns record
+  community.general.ipa_dnsrecord:
+    ipa_user: "{{ ansible_user }}"
+    ipa_pass: "{{ ansible_password }}"
+    zone_name: "{{ ansible_facts['domain'] }}"
+    record_name: "{{  rproxy_service_name  }}"
+    record_type: 'CNAME'
+    record_value: "{{ ansible_facts['hostname'] }}"
+    state: present
+  ignore_errors: true
+
+- name: Kinit
+  ansible.builtin.shell:
+    cmd: "echo '{{ ansible_password }}' | kinit"
+  become: false
+  become_user: "{{ ansible_user }}"
+
+- name: Create fake host for certificate
+  ansible.builtin.shell:
+    cmd: "ipa host-add {{ rproxy_service_name }}.{{ ansible_facts['domain'] }} --force --desc=\"Fake host for SPN\""
+  become: false
+  become_user: "{{ ansible_user }}"
+  ignore_errors: true
+
+- name: Create SPN for HTTP
+  ansible.builtin.shell:
+    cmd: "ipa service-add HTTP/{{ rproxy_service_name }}.{{ ansible_facts['domain'] }} --skip-host-check --force"
+  become: false
+  become_user: "{{ ansible_user }}"
+  ignore_errors: true
+
+- name: "Allow {{ ansible_facts['hostname'] }}.{{ ansible_facts['domain'] }} to get certificates for HTTP/{{ rproxy_service_name }}.{{ ansible_facts['domain'] }} SPN"
+  ansible.builtin.shell:
+    cmd: "ipa service-add-host --hosts={{ ansible_facts['hostname'] }}.{{ ansible_facts['domain'] }} HTTP/{{ rproxy_service_name }}.{{ ansible_facts['domain'] }}"
+  become: false
+  become_user: "{{ ansible_user }}"
+  ignore_errors: true
+
+- name: Kdestroy
+  ansible.builtin.shell:
+    cmd: kdestroy
+  become: false
+  become_user: "{{ ansible_user }}"
+
+- name: Get all tracking certificates
+  ansible.builtin.shell:
+    cmd: "ipa-getcert list | grep -m1 -B5 \"{{ rproxy_dir }}/certs/{{ rproxy_service_name }}\" | grep Request | awk '{print $NF}' | tr -d \"'\\|:\""
+  register: tracking_list
+
+- name: Remove certificates from IPA tracking
+  ansible.builtin.shell:
+    cmd: "ipa-getcert stop-tracking -i {{ item }}"
+  loop: "{{ tracking_list.stdout_lines }}"
+  ignore_errors: true
+
+- name: Request certificate via ipa-getcert
+  ansible.builtin.command: >
+    ipa-getcert request
+    -f {{ rproxy_dir }}/certs/{{ rproxy_service_name }}.{{ ansible_facts['domain'] }}.crt
+    -k {{ rproxy_dir }}/certs/{{ rproxy_service_name }}.{{ ansible_facts['domain'] }}.key
+    -K HTTP/{{ rproxy_service_name }}.{{ ansible_facts['domain'] }}
+    -N CN={{ rproxy_service_name }}.{{ ansible_facts['domain'] }}
+
+- name: Wait for certificate to appear
+  ansible.builtin.wait_for:
+    path: "{{ rproxy_dir }}/certs/{{ rproxy_service_name }}.{{ ansible_facts['domain'] }}.crt"
+    timeout: 60
+
+- name: Change certificate permissions
+  ansible.builtin.file:
+    path: "{{ rproxy_dir }}/certs/{{ rproxy_service_name }}.{{ ansible_facts['domain'] }}.crt"
+    mode: "0744"
+
+- name: Wait for certificate key to appear
+  ansible.builtin.wait_for:
+    path: "{{ rproxy_dir }}/certs/{{ rproxy_service_name }}.{{ ansible_facts['domain'] }}.key"
+    timeout: 60
+
+- name: Change certificate key permissions
+  ansible.builtin.file:
+    path: "{{ rproxy_dir }}/certs/{{ rproxy_service_name }}.{{ ansible_facts['domain'] }}.key"
+    mode: "0744"

roles/addconfig/tasks/main.yml

@@ -0,0 +1,14 @@
+---
+- name: Add config
+  ansible.builtin.include_tasks: 
+    file: addconfig.yml
+
+- name: Generate certificates
+  ansible.builtin.include_tasks: 
+    file: certificates.yml
+
+- name: Restart rproxy service
+  ansible.builtin.systemd:
+    name: "container-rproxy.service"
+    state: restarted
+    enabled: yes

roles/addconfig/vars/main.yml

@@ -0,0 +1,5 @@
+---
+ansible_python_interpreter: /usr/bin/python3
+
+# Rproxy
+rproxy_dir: /opt/rproxy

roles/podman/tasks/main.yml

@@ -5,8 +5,6 @@
       - podman
       - podman-compose
       - podman-docker
-      - podman-remote
-      - podman-tui
       - buildah
     update_cache: yes
 

roles/podman/vars/main.yml

@@ -0,0 +1,2 @@
+---
+ansible_python_interpreter: /usr/bin/python3

roles/rproxy/files/repo.conf

@@ -20,7 +20,7 @@ server {
         dav_methods PUT DELETE MKCOL;
         dav_access user:rw group:r all:r;
         create_full_put_path on;
-        client_max_body_size 100m;
+        client_max_body_size 5g;
 
         # auth_basic "Needs to auth";
         # auth_basic_user_file /etc/nginx/.htpasswd;

roles/rproxy/tasks/addconfig.yml

@@ -1,82 +0,0 @@
----
-- name: Create server configs
-  block:
-    - name: Copy server.conf
-      ansible.builtin.template:
-        src: templates/server.conf.j2
-        dest: "{{ rproxy_dir }}/sites/{{  rproxy_service_name  }}.conf"
-
-- name: Generate certificates for {{  rproxy_service_name  }}
-  block:
-    - name: Create CNAME dns record
-      community.general.ipa_dnsrecord:
-        ipa_user: "{{ ansible_user }}"
-        ipa_pass: "{{ ansible_password }}"
-        zone_name: "{{ ansible_facts['domain'] }}"
-        record_name: "{{  rproxy_service_name  }}"
-        record_type: 'CNAME'
-        record_value: "{{ ansible_facts['hostname'] }}"
-        state: present
-
-    - name: Kinit
-      ansible.builtin.shell:
-        cmd: "echo '{{ ansible_password }}' | kinit"
-      become: false
-      become_user: "{{ ansible_user }}"
-
-    - name: Create fake host for certificate
-      ansible.builtin.shell:
-        cmd: "ipa host-add {{ rproxy_service_name }}.{{ ansible_facts['domain'] }} --force --desc=\"Fake host for SPN\""
-      become: false
-      become_user: "{{ ansible_user }}"
-      ignore_errors: true
-
-    - name: Create SPN for HTTP
-      ansible.builtin.shell:
-        cmd: "ipa service-add HTTP/{{ rproxy_service_name }}.{{ ansible_facts['domain'] }} --skip-host-check --force"
-      become: false
-      become_user: "{{ ansible_user }}"
-      ignore_errors: true
-
-    - name: "Allow {{ ansible_facts['hostname'] }}.{{ ansible_facts['domain'] }} to get certificates for HTTP/{{ rproxy_service_name }}.{{ ansible_facts['domain'] }} SPN "
-      ansible.builtin.shell:
-        cmd: "ipa service-add-host --hosts={{ ansible_facts['hostname'] }}.{{ ansible_facts['domain'] }} HTTP/{{ rproxy_service_name }}.{{ ansible_facts['domain'] }}"
-      become: false
-      become_user: "{{ ansible_user }}"
-      ignore_errors: true
-
-    - name: Request certificate via ipa-getcert
-      ansible.builtin.command: >
-        ipa-getcert request
-        -f {{ rproxy_dir }}/certs/{{ rproxy_service_name }}.{{ ansible_facts['domain'] }}.crt
-        -k {{ rproxy_dir }}/certs/{{ rproxy_service_name }}.{{ ansible_facts['domain'] }}.key
-        -K HTTP/{{ rproxy_service_name }}.{{ ansible_facts['domain'] }}
-        -N CN={{ rproxy_service_name }}.{{ ansible_facts['domain'] }}
-
-    # sudo ipa-getcert stop-tracking -i 20250813210258 if track already exists
-
-    - name: Wait for certificate to appear
-      ansible.builtin.wait_for:
-        path: "{{ rproxy_dir }}/certs/{{ rproxy_service_name }}.{{ ansible_facts['domain'] }}.crt"
-        timeout: 60
-
-    - name: Change certificate permissions
-      ansible.builtin.file:
-        path: "{{ rproxy_dir }}/certs/{{ rproxy_service_name }}.{{ ansible_facts['domain'] }}.crt"
-        mode: "0744"
-
-    - name: Wait for certificate key to appear
-      ansible.builtin.wait_for:
-        path: "{{ rproxy_dir }}/certs/{{ rproxy_service_name }}.{{ ansible_facts['domain'] }}.key"
-        timeout: 60
-
-    - name: Change certificate key permissions
-      ansible.builtin.file:
-        path: "{{ rproxy_dir }}/certs/{{ rproxy_service_name }}.{{ ansible_facts['domain'] }}.key"
-        mode: "0744"
-
-- name: Restart rproxy service
-  ansible.builtin.systemd:
-    name: "container-rproxy.service"
-    state: restarted
-    enabled: yes

roles/rproxy/tasks/certificates.yml

@@ -0,0 +1,59 @@
+---
+- name: Kinit
+  ansible.builtin.shell:
+    cmd: "echo '{{ ansible_password }}' | kinit"
+  become: false
+  become_user: "{{ ansible_user }}"
+
+- name: Create SPN for HTTP
+  ansible.builtin.shell:
+    cmd: "ipa service-add HTTP/{{ ansible_facts['hostname'] }}.{{ ansible_facts['domain'] }}"
+  become: false
+  become_user: "{{ ansible_user }}"
+  ignore_errors: true
+
+- name: Kdestroy
+  ansible.builtin.shell:
+    cmd: kdestroy
+  become: false
+  become_user: "{{ ansible_user }}"
+
+- name: Get all tracking certificates
+  ansible.builtin.shell:
+    cmd: "ipa-getcert list | grep -m1 -B5 \"{{ rproxy_dir }}/certs/repo\" | grep Request | awk '{print $NF}' | tr -d \"'\\|:\""
+  register: tracking_list
+
+- name: Remove certificates from IPA tracking
+  ansible.builtin.shell:
+    cmd: "ipa-getcert stop-tracking -i {{ item }}"
+  loop: "{{ tracking_list.stdout_lines }}"
+  ignore_errors: true
+
+- name: Request certificate via ipa-getcert
+  ansible.builtin.command: >
+    ipa-getcert request
+    -f {{ rproxy_dir }}/certs/repo.crt
+    -k {{ rproxy_dir }}/certs/repo.key
+    -K HTTP/{{ ansible_facts['hostname'] }}.{{ ansible_facts['domain'] }}
+    -N CN={{ ansible_facts['hostname'] }}.{{ ansible_facts['domain'] }}
+    -F {{ rproxy_dir }}/certs/RootCA.crt
+
+- name: Wait for certificate to appear
+  ansible.builtin.wait_for:
+    path: "{{ rproxy_dir }}/certs/repo.crt"
+    timeout: 60
+
+- name: Change certificate permissions
+  ansible.builtin.file:
+    path: "{{ rproxy_dir }}/certs/repo.crt"
+    mode: "0744"
+
+- name: Wait for certificate key to appear
+  ansible.builtin.wait_for:
+    path: "{{ rproxy_dir }}/certs/repo.key"
+    timeout: 60
+
+- name: Change certificate key permissions
+  ansible.builtin.file:
+    path: "{{ rproxy_dir }}/certs/repo.key"
+    mode: "0744"

roles/rproxy/tasks/configs.yml

@@ -0,0 +1,10 @@
+---
+- name: Copy repo.conf
+  ansible.builtin.copy:
+    src: files/repo.conf
+    dest: "{{ rproxy_dir }}/sites/repo.conf"
+
+- name: Copy nginx.conf
+  ansible.builtin.copy:
+    src: files/nginx.conf
+    dest: "{{ rproxy_dir }}/nginx.conf"

roles/rproxy/tasks/dirs.yml

@@ -0,0 +1,61 @@
+---
+- name: Remove rproxy dir
+  ansible.builtin.file:
+    path: "{{ rproxy_dir }}"
+    state: absent
+
+- name: Create rproxy dir
+  ansible.builtin.file:
+    path: "{{ rproxy_dir }}"
+    state: directory
+
+- name: Create rproxy data dir
+  ansible.builtin.file:
+    path: "{{ repo_data_dir }}"
+    state: directory
+
+- name: "Create {{ repo_data_dir }}/archive"
+  ansible.builtin.file:
+    path: "{{ repo_data_dir }}/archive"
+    state: directory
+
+- name: "Create {{ repo_data_dir }}/pip"
+  ansible.builtin.file:
+    path: "{{ repo_data_dir }}/pip"
+    state: directory
+
+- name: "Create {{ repo_data_dir }}/pip/py3"
+  ansible.builtin.file:
+    path: "{{ repo_data_dir }}/pip/py3"
+    state: directory
+
+- name: "Create {{ repo_data_dir }}/repo"
+  ansible.builtin.file:
+    path: "{{ repo_data_dir }}/repo"
+    state: directory
+
+- name: "Create {{ repo_data_dir }}/repo/almalinux"
+  ansible.builtin.file:
+    path: "{{ repo_data_dir }}/repo/almalinux"
+    state: directory
+
+- name: "Create {{ repo_data_dir }}/repo/almalinux/10"
+  ansible.builtin.file:
+    path: "{{ repo_data_dir }}/repo/almalinux/10"
+    state: directory
+
+- name: Create sites dir
+  ansible.builtin.file:
+    path: "{{ rproxy_dir }}/sites"
+    state: directory
+
+- name: Create certs dir
+  ansible.builtin.file:
+    path: "{{ rproxy_dir }}/certs"
+    state: directory
+
+- name: Create repo dir
+  ansible.builtin.file:
+    path: "{{ repo_data_dir }}"
+    state: directory
+    mode: 0777

roles/rproxy/tasks/dockerrepo.yml

@@ -1,113 +0,0 @@
----
-- name: Prepare for image repository
-  block:
-    - name: Remove dockerrepo dir
-      ansible.builtin.file:
-        path: "{{ dockerrepo_dir }}"
-        state: absent
-
-    - name: Create dockerrepo dir
-      ansible.builtin.file:
-        path: "{{ dockerrepo_dir }}"
-        state: directory
-
-    - name: Create repo dir
-      ansible.builtin.file:
-        path: "{{ dockerrepo_data_dir }}"
-        state: directory
-
-    - name: Create certs dir
-      ansible.builtin.file:
-        path: "{{ dockerrepo_dir }}/certs"
-        state: directory
-
-- name: Create certificates for image repository
-  block:
-    - name: Kinit
-      ansible.builtin.shell:
-        cmd: "echo '{{ ansible_password }}' | kinit"
-      become: false
-      become_user: "{{ ansible_user }}"
-
-    - name: Create SPN for HTTP
-      ansible.builtin.shell:
-        cmd: "ipa service-add HTTP/{{ ansible_facts['hostname'] }}.{{ ansible_facts['domain'] }}"
-      become: false
-      become_user: "{{ ansible_user }}"
-      ignore_errors: true
-
-    - name: Request certificate via ipa-getcert
-      ansible.builtin.command: >
-        ipa-getcert request
-        -f {{ rproxy_dir }}/certs/dockerrepo.crt
-        -k {{ rproxy_dir }}/certs/dockerrepo.key
-        -K HTTP/{{ ansible_facts['hostname'] }}.{{ ansible_facts['domain'] }}
-        -N CN={{ ansible_facts['hostname'] }}.{{ ansible_facts['domain'] }}
-
-    # sudo ipa-getcert stop-tracking -i 20250813210258 if track already exists
-
-    - name: Wait for certificate to appear
-      ansible.builtin.wait_for:
-        path: "{{ rproxy_dir }}/certs/dockerrepo.crt"
-        timeout: 60
-
-    - name: Change certificate permissions
-      ansible.builtin.file:
-        path: "{{ rproxy_dir }}/certs/dockerrepo.crt"
-        mode: "0744"
-
-    - name: Wait for certificate key to appear
-      ansible.builtin.wait_for:
-        path: "{{ rproxy_dir }}/certs/dockerrepo.key"
-        timeout: 60
-
-    - name: Change certificate key permissions
-      ansible.builtin.file:
-        path: "{{ rproxy_dir }}/certs/dockerrepo.key"
-        mode: "0744"
-
-- name: Start image repository
-  block:
-    - name: Pull repo image
-      containers.podman.podman_image:
-        name: registry:latest
-        state: present
-
-    - name: Delete image repository container if exists
-      containers.podman.podman_container:
-        name: registry
-        state: absent
-
-    - name: Start registry
-      containers.podman.podman_container:
-        name: registry
-        image: registry:latest
-        state: started
-        ports:
-            - "5000:5000"
-        env:
-          REGISTRY_HTTP_TLS_CERTIFICATE: "/certs/dockerrepo.crt"
-          REGISTRY_HTTP_TLS_KEY: "/certs/dockerrepo.key"
-        volumes:
-          - "{{ dockerrepo_data_dir }}:/var/lib/registry:z,rw"
-          - "{{ dockerrepo_dir }}/certs:/certs:z,rw"
-          - "/etc/localtime:/etc/localtime:ro"
-        privileged: true
-        security_opt:
-          - "label=disable"
-        log_driver: journald
-        generate_systemd:
-          path: /etc/systemd/system/
-          restart_policy: always
-          stop_timeout: 120
-          names: true
-
-    - name: Daemon reload
-      ansible.builtin.shell:
-        cmd: systemctl daemon-reload
-
-    - name: Enable registry service
-      ansible.builtin.systemd:
-        name: "container-registry.service"
-        state: started
-        enabled: yes

roles/rproxy/tasks/main.yml

@@ -1,40 +1,24 @@
 ---
-- name: Podman install
+- name: Prepare directories
   ansible.builtin.include_tasks: 
-    file: podman.yml
+    file: dirs.yml
-    apply:
+
-      tags: install
+- name: Copy configs
-  tags:
+  ansible.builtin.include_tasks: 
-  - install
+    file: configs.yml
+
+- name: Generate certificates
+  ansible.builtin.include_tasks: 
+    file: certificates.yml
 
 - name: Rproxy install
   ansible.builtin.include_tasks: 
     file: rproxy.yml
-    apply:
-      tags: install
-  tags:
-  - install
 
-- name: Repo install
+- name: Repository install
   ansible.builtin.include_tasks: 
     file: repo.yml
-    apply:
-      tags: install
-  tags:
-  - install
 
-- name: Docker repo install
+- name: Pypi repository install
   ansible.builtin.include_tasks: 
-    file: dockerrepo.yml
+    file: pypi.yml
-    apply:
-      tags: install
-  tags:
-  - install
-
-- name: Add config
-  ansible.builtin.include_tasks: 
-    file: addconfig.yml
-    apply:
-      tags: add_config
-  tags:
-  - add_config

roles/rproxy/tasks/pypi.yml

@@ -0,0 +1,17 @@
+---
+- name: Install pypi-server
+  ansible.builtin.pip:
+    name:
+      - pypiserver
+
+- name: Copy pypi-server service file
+  ansible.builtin.template:
+    src: "templates/pypiserver.service.j2"
+    dest: "/etc/systemd/system/pypiserver.service"
+
+- name: Enable pypiserver service
+  ansible.builtin.systemd:
+    name: "pypiserver.service"
+    state: started
+    enabled: yes
+    daemon_reload: yes

roles/rproxy/tasks/repo.yml

@@ -1,71 +1,9 @@
 ---
-- name: Prepare for https repository
+- name: Install createrepo
-  block:
+  ansible.builtin.yum:
-    - name: Create repo dir
+    name:
-      ansible.builtin.file:
+      - createrepo
-        path: "{{ repo_data_dir }}"
+    update_cache: yes
-        state: directory
-        mode: 0777
-
-    - name: Copy repo.conf
-      ansible.builtin.copy:
-        src: files/repo.conf
-        dest: "{{ rproxy_dir }}/sites/repo.conf"
-
-- name: Create https certificates for repository
-  block:
-    - name: Kinit
-      ansible.builtin.shell:
-        cmd: "echo '{{ ansible_password }}' | kinit"
-      become: false
-      become_user: "{{ ansible_user }}"
-
-    - name: Create SPN for HTTP
-      ansible.builtin.shell:
-        cmd: "ipa service-add HTTP/{{ ansible_facts['hostname'] }}.{{ ansible_facts['domain'] }}"
-      become: false
-      become_user: "{{ ansible_user }}"
-      ignore_errors: true
-
-    - name: Get all tracking certificates
-      ansible.builtin.shell:
-        cmd: ipa-getcert list | grep "ID" | awk '{print $NF}' | tr -d "'\|:"
-      register: tracking_list
-
-    - name: Remove certificates from IPA tracking
-      ansible.builtin.shell:
-        cmd: "ipa-getcert stop-tracking -i {{ item }}"
-      loop: "{{ tracking_list.stdout_lines }}"
-      ignore_errors: true
-
-    - name: Request certificate via ipa-getcert
-      ansible.builtin.command: >
-        ipa-getcert request
-        -f {{ rproxy_dir }}/certs/repo.crt
-        -k {{ rproxy_dir }}/certs/repo.key
-        -K HTTP/{{ ansible_facts['hostname'] }}.{{ ansible_facts['domain'] }}
-        -N CN={{ ansible_facts['hostname'] }}.{{ ansible_facts['domain'] }}
-        -F {{ rproxy_dir }}/certs/RootCA.crt
-
-    - name: Wait for certificate to appear
-      ansible.builtin.wait_for:
-        path: "{{ rproxy_dir }}/certs/repo.crt"
-        timeout: 60
-
-    - name: Change certificate permissions
-      ansible.builtin.file:
-        path: "{{ rproxy_dir }}/certs/repo.crt"
-        mode: "0744"
-
-    - name: Wait for certificate key to appear
-      ansible.builtin.wait_for:
-        path: "{{ rproxy_dir }}/certs/repo.key"
-        timeout: 60
-
-    - name: Change certificate key permissions
-      ansible.builtin.file:
-        path: "{{ rproxy_dir }}/certs/repo.key"
-        mode: "0744"
 
 - name: Restart rproxy service
   ansible.builtin.systemd:

roles/rproxy/tasks/rproxy.yml

@@ -1,81 +1,42 @@
 ---
-- name: Prepare dirs for rproxy
+- name: Pull rproxy image
-  block:
+  containers.podman.podman_image:
-    - name: Remove rproxy dir
+    name: "{{ image_repo }}/{{ rproxy_image }}:{{ rproxy_version }}"
-      ansible.builtin.file:
+    state: present
-        path: "{{ rproxy_dir }}"
-        state: absent
 
-    - name: Create data dir
+- name: Delete rproxy container if exists
-      ansible.builtin.file:
+  containers.podman.podman_container:
-        path: "{{ data_dir }}"
+    name: rproxy
-        state: directory
+    state: absent
 
-    - name: Create rproxy dir
+- name: Start rproxy
-      ansible.builtin.file:
+  containers.podman.podman_container:
-        path: "{{ rproxy_dir }}"
+    name: rproxy
-        state: directory
+    image: "{{ image_repo }}/{{ rproxy_image }}:{{ rproxy_version }}"
+    state: started
+    ports:
+        - "443:443"
+        - "80:80"
+        - "9000:9000"
+    volumes:
+      - '{{ rproxy_dir }}/nginx.conf:/etc/nginx/nginx.conf:z,rw'
+      - '{{ rproxy_dir }}/sites:/etc/nginx/sites:z,rw'
+      - '{{ rproxy_dir }}/certs:/etc/nginx/certs:z,rw'
+      - '{{ repo_data_dir }}:/repo:z,rw'
+      - "/etc/localtime:/etc/localtime:ro"
+    privileged: true
+    security_opt:
+      - "label=disable"
+    log_driver: journald
+    generate_systemd:
+      path: /etc/systemd/system/
+      restart_policy: always
+      stop_timeout: 120
+      names: true
 
-    - name: Create rproxy data dir
+- name: Enable rproxy service
-      ansible.builtin.file:
+  ansible.builtin.systemd:
-        path: "{{ repo_data_dir }}"
+    name: "container-rproxy.service"
-        state: directory
+    state: started
-
+    enabled: yes
-    - name: Create sites dir
+    daemon_reload: yes
-      ansible.builtin.file:
-        path: "{{ rproxy_dir }}/sites"
-        state: directory
-
-    - name: Create certs dir
-      ansible.builtin.file:
-        path: "{{ rproxy_dir }}/certs"
-        state: directory
-
-    - name: Copy nginx.conf
-      ansible.builtin.copy:
-        src: files/nginx.conf
-        dest: "{{ rproxy_dir }}/nginx.conf"
-
-- name: Install rproxy
-  block:
-    - name: Pull rproxy image
-      containers.podman.podman_image:
-        name: "docker.io/library/nginx:{{ rproxy_version }}"
-        state: present
-
-    - name: Delete rproxy container if exists
-      containers.podman.podman_container:
-        name: rproxy
-        state: absent
-
-    - name: Start rproxy
-      containers.podman.podman_container:
-        name: rproxy
-        image: "docker.io/library/nginx:{{ rproxy_version }}"
-        state: started
-        ports:
-            - "443:443"
-            - "80:80"
-            - "9000:9000"
-        volumes:
-          - '{{ rproxy_dir }}/nginx.conf:/etc/nginx/nginx.conf:z,rw'
-          - '{{ rproxy_dir }}/sites:/etc/nginx/sites:z,rw'
-          - '{{ rproxy_dir }}/certs:/etc/nginx/certs:z,rw'
-          - '{{ repo_data_dir }}:/repo:z,rw'
-          - "/etc/localtime:/etc/localtime:ro"
-        privileged: true
-        security_opt:
-          - "label=disable"
-        log_driver: journald
-        generate_systemd:
-          path: /etc/systemd/system/
-          restart_policy: always
-          stop_timeout: 120
-          names: true
-
-    - name: Enable rproxy service
-      ansible.builtin.systemd:
-        name: "container-rproxy.service"
-        state: started
-        enabled: yes
-        daemon_reload: yes

roles/rproxy/templates/pypiserver.service.j2

@@ -0,0 +1,17 @@
+[Unit]
+Description=PyPI Server (pypiserver)
+After=network.target
+Wants=network.target
+
+[Service]
+Type=simple
+WorkingDirectory={{ repo_data_dir }}/pip/py3
+ExecStart=/usr/bin/python3 -m pypiserver -p 10000 -o {{ repo_data_dir }}/pip/py3
+Restart=always
+RestartSec=5
+StandardOutput=journal
+StandardError=journal
+ReadWriteDirectories={{ repo_data_dir }}/pip/py3
+
+[Install]
+WantedBy=multi-user.target

roles/rproxy/vars/main.yml

@@ -1,7 +1,9 @@
+---
+# General
 ansible_python_interpreter: /usr/bin/python3
+
+# Rproxy
+rproxy_image: nginx
+rproxy_version: 1.29
 rproxy_dir: /opt/rproxy
-rproxy_version: 1.29.0
+repo_data_dir: /opt/repodata
-data_dir: /opt/data
-repo_data_dir: /opt/data/repo
-dockerrepo_dir: /opt/dockerrepo
-dockerrepo_data_dir: /opt/data/dockerrepo

rproxy.yml

@@ -1,22 +1,12 @@
 ---
 - hosts: all
   become: yes
-
-  vars:
-    ansible_python_interpreter: /usr/bin/python3
   
   vars_prompt:
-    - name: rproxy_service_name
+    - name: image_repo
-      prompt: Enter service for rproxy
+      prompt: Enter repository address with podman images (ex. rproxy.olsson.ul:5000)
-      private: false
-
-    - name: rproxy_service_port
-      prompt: Enter service for rproxy
-      private: false
-
-    - name: rproxy_service_address
-      prompt: Enter service for rproxy
       private: false
 
   roles:
+    - podman
     - rproxy