Skip to content

Commit

Permalink
Render socks5.Dockerfile
Browse files Browse the repository at this point in the history
  • Loading branch information
ed-asriyan committed Jan 17, 2025
1 parent c2e046d commit f6adf83
Show file tree
Hide file tree
Showing 8 changed files with 21 additions and 3 deletions.
3 changes: 3 additions & 0 deletions config/users-configs.example.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,6 @@ config_users_title:

# support url. see https://hiddify.com/app/URL-Scheme
config_users_support_url:

# url where frontman is hosted
config_users_base_url:
3 changes: 3 additions & 0 deletions roles/users-configs/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,6 @@ users_configs_title:

# see https://hiddify.com/app/URL-Scheme
users_configs_support_url:

# url where frontman is hosted
users_configs_base_url:
7 changes: 6 additions & 1 deletion roles/users-configs/tasks/render_configs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,16 @@
src: hiddify.j2
dest: "{{ users_configs_static_root_local }}/{{ users_configs_config_uuid }}/index.html"

- name: Render client configs
- name: Render xray-client config
template:
src: client-xray-config.json.j2
dest: "{{ users_configs_static_root_local }}/{{ users_configs_config_uuid }}/{{ user_configs_client_xray_config_filename }}"

- name: Render sock5.Dockerfile
template:
src: socks5.Dockerfile.j2
dest: "{{ users_configs_static_root_local }}/{{ users_configs_config_uuid }}/{{ users_configs_socks5_docker_filename }}"

- name: Render urls map
template:
src: urls-map.json.j2
Expand Down
3 changes: 3 additions & 0 deletions roles/users-configs/templates/socks5.Dockerfile.j2
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
FROM teddysun/xray:latest
RUN apk add --no-cache curl
CMD curl {{ users_configs_base_url }}/{{ users_configs_config_uuid }}/{{ user_configs_client_xray_config_filename }} > /etc/xray/config.json && xray run -c /etc/xray/config.json
5 changes: 3 additions & 2 deletions roles/users-configs/templates/urls-map.json.j2
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"xray_client_config_url": "/{{ users_configs_config_uuid }}/{{ user_configs_client_xray_config_filename }}",
"hiddify_url": "/{{ users_configs_config_uuid }}/{{ user_configs_hiddify_filename }}"
"xray_client_config_url": "{{ users_configs_base_url }}/{{ users_configs_config_uuid }}/{{ user_configs_client_xray_config_filename }}",
"hiddify_url": "{{ users_configs_base_url }}/{{ users_configs_config_uuid }}/{{ user_configs_hiddify_filename }}",
"sock5_docker": "{{ users_configs_base_url }}/{{ users_configs_config_uuid }}/{{ users_configs_socks5_docker_filename }}"
}
1 change: 1 addition & 0 deletions roles/users-configs/vars/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ user_configs_frontend_html_url: https://github.com/ed-asriyan/xray-server-fronte
users_configs_urls_map_filename: urls-map.json
user_configs_hiddify_filename: hiddify
user_configs_client_xray_config_filename: client-xray-config.json
users_configs_socks5_docker_filename: socks5.Dockerfile
1 change: 1 addition & 0 deletions roles/xray/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@
files:
- "{{ xray_config_file_name }}"
- "{{ xray_downloads[arch.stdout].directory }}"
- "{{ xray_error_log_file_name }}"

- name: Render systemd service config
template:
Expand Down
1 change: 1 addition & 0 deletions users-configs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,3 +45,4 @@
users_configs_static_directory_filename: static
users_configs_title: "{{ config_users_title }}"
users_configs_support_url: "{{ config_users_support_url }}"
users_configs_base_url: "{{ config_users_base_url }}"

0 comments on commit f6adf83

Please sign in to comment.