diff --git a/roles/radius_server/tasks/main.yml b/roles/radius_server/tasks/main.yml index 56f7749..35214c3 100644 --- a/roles/radius_server/tasks/main.yml +++ b/roles/radius_server/tasks/main.yml @@ -115,7 +115,7 @@ tags: template - name: "create symbolic link" - shell: ln -s /etc/raddb/mods-available/sql /etc/raddb/mods-enabled/ + shell: ln -sf /etc/raddb/mods-available/sql /etc/raddb/mods-enabled/ args: executable: /bin/bash tags: shell diff --git a/roles/radius_server/templates/radiusd.conf.j2 b/roles/radius_server/templates/radiusd.conf.j2 index dc58473..0eb20fb 100644 --- a/roles/radius_server/templates/radiusd.conf.j2 +++ b/roles/radius_server/templates/radiusd.conf.j2 @@ -44,7 +44,7 @@ log { # colourise = yes - NOT used. + # file = ${logdir}/radius.log diff --git a/wannat-install.tmp.yml b/wannat-install.tmp.yml deleted file mode 100644 index 0ca6bad..0000000 --- a/wannat-install.tmp.yml +++ /dev/null @@ -1,49 +0,0 @@ ---- -#- hosts: wangw -# roles: -# - wangw -# - wire_graft_devel -# - wire_graft -# vars_files: -# - wannat_deploy_env/all.yml - -#- hosts: natgw - #roles: - #- wire_graft_devel - #- natgw - #vars_files: - #- wannat_deploy_env/all.yml - -#- hosts: toroad -# roles: -# - wire_graft_devel -# - toroad -# vars_files: -# - wannat_deploy_env/all.yml -# -#- hosts: natgw -# roles: -# - natgw -# - wire_graft_devel -# -# -# - -#- hosts: radius_client -# roles: -# - radius_client -# vars_files: -# - wannat_deploy_env/all.yml - -- hosts: radius_server - roles: - - radius_server - vars_files: - - wannat_deploy_env/all.yml - -#- hosts: pptpd - #roles: - #- pptpd - #vars_files: - #- wannat_deploy_env/all.yml - diff --git a/wannat-install.yml b/wannat-install.yml index d2fe5c7..2f30678 100644 --- a/wannat-install.yml +++ b/wannat-install.yml @@ -24,9 +24,8 @@ - hosts: natgw roles: + - wire_graft_devel - natgw - - wire_graft_devel - - hosts: radius_client roles: diff --git a/wannat_deploy_env/hosts b/wannat_deploy_env/hosts index fd440e9..641776d 100644 --- a/wannat_deploy_env/hosts +++ b/wannat_deploy_env/hosts @@ -3,15 +3,21 @@ ansible_user=root install_sapp=false +[wangw] +192.168.40.161 + [natgw] -192.168.40.133 +192.168.40.134 + +[toroad] +192.168.40.134 [pptpd] -192.168.40.133 - -[radius_client] -192.168.40.133 +192.168.40.134 [radius_server] -192.168.40.137 +192.168.44.71 + +[radius_client] +192.168.40.134 diff --git a/xxg_integration_env/group_vars/all.yml b/xxg_integration_env/group_vars/all.yml deleted file mode 100644 index 43f7978..0000000 --- a/xxg_integration_env/group_vars/all.yml +++ /dev/null @@ -1,23 +0,0 @@ -wangw_global: - wangw: - NAT_GW_tunnel_device: "enp6s0" - NAT_GW_tunnel_ip: "192.168.40.134" - redis_server_ip: "192.168.44.71" - redis_server_port: 7002 - redis_index: 0 - - toroad: - redis_server_ip: "192.168.44.71" - redis_server_port: 7002 - redis_index: 0 - - wiregraft: - identification_by_which_device: "enp6s0" - toroad_server_ip: "192.168.40.134" - - rpm_files: - wangw_rpm_file: "libwangw-1.2.1.cb66dda-2.el7.x86_64.rpm" - wire_graft_rpm_file: "libwire_graft-1.2.0.7fdacbc-2.el7.x86_64.rpm" - wire_graft_devel_rpm_file: "libwire_graft-devel-1.2.0.7fdacbc-2.el7.x86_64.rpm" - toroad_rpm_file: "toroad-1.1.11.b0562a5-2.el7.x86_64.rpm" - diff --git a/xxg_integration_env/hosts.xxg b/xxg_integration_env/hosts.xxg deleted file mode 100644 index 8a53859..0000000 --- a/xxg_integration_env/hosts.xxg +++ /dev/null @@ -1,12 +0,0 @@ -[all:vars] -ansible_user=root -install_sapp=false -install_device_sn=false -install_device_tag=false - -[wangw] -192.168.40.161 - -[toroad] -192.168.40.134 - diff --git a/xxg_module_test_env/group_vars/all.yml b/xxg_module_test_env/group_vars/all.yml deleted file mode 100644 index b00bdc6..0000000 --- a/xxg_module_test_env/group_vars/all.yml +++ /dev/null @@ -1,26 +0,0 @@ -wangw_global: - wangw: - NAT_GW_tunnel_device: "enp8s0" - NAT_GW_tunnel_ip: "192.168.40.133" - NAT_GW_tunnel_listen_port: 3544 - NAT_GW_tunnel_remote_port: 3544 - redis_server_ip: "192.168.44.3" - redis_server_port: 7002 - redis_index: 0 - - toroad: - redis_server_ip: "192.168.44.3" - redis_server_port: 7002 - redis_index: 0 - - wiregraft: - identification_by_which_device: "enp8s0" - toroad_server_ip: "192.168.40.133" - toroad_server_port: "8888" - - rpm_files: - wangw_rpm_file: "libwangw-1.2.1.cb66dda-2.el7.x86_64.rpm" - wire_graft_rpm_file: "libwire_graft-1.2.0.7fdacbc-2.el7.x86_64.rpm" - wire_graft_devel_rpm_file: "libwire_graft-devel-1.2.0.7fdacbc-2.el7.x86_64.rpm" - toroad_rpm_file: "toroad-1.1.11.b0562a5-2.el7.x86_64.rpm" - diff --git a/xxg_module_test_env/hosts.xxg b/xxg_module_test_env/hosts.xxg deleted file mode 100644 index 6c224bf..0000000 --- a/xxg_module_test_env/hosts.xxg +++ /dev/null @@ -1,12 +0,0 @@ -[all:vars] -ansible_user=root -install_sapp=false -install_device_sn=false -install_device_tag=false - -[wangw] -192.168.40.21 - -[toroad] -192.168.40.133 - diff --git a/xxg_test_env/group_vars/all.yml b/xxg_test_env/group_vars/all.yml deleted file mode 100644 index b00bdc6..0000000 --- a/xxg_test_env/group_vars/all.yml +++ /dev/null @@ -1,26 +0,0 @@ -wangw_global: - wangw: - NAT_GW_tunnel_device: "enp8s0" - NAT_GW_tunnel_ip: "192.168.40.133" - NAT_GW_tunnel_listen_port: 3544 - NAT_GW_tunnel_remote_port: 3544 - redis_server_ip: "192.168.44.3" - redis_server_port: 7002 - redis_index: 0 - - toroad: - redis_server_ip: "192.168.44.3" - redis_server_port: 7002 - redis_index: 0 - - wiregraft: - identification_by_which_device: "enp8s0" - toroad_server_ip: "192.168.40.133" - toroad_server_port: "8888" - - rpm_files: - wangw_rpm_file: "libwangw-1.2.1.cb66dda-2.el7.x86_64.rpm" - wire_graft_rpm_file: "libwire_graft-1.2.0.7fdacbc-2.el7.x86_64.rpm" - wire_graft_devel_rpm_file: "libwire_graft-devel-1.2.0.7fdacbc-2.el7.x86_64.rpm" - toroad_rpm_file: "toroad-1.1.11.b0562a5-2.el7.x86_64.rpm" - diff --git a/xxg_test_env/hosts.xxg b/xxg_test_env/hosts.xxg deleted file mode 100644 index fc5de53..0000000 --- a/xxg_test_env/hosts.xxg +++ /dev/null @@ -1,12 +0,0 @@ -[all:vars] -ansible_user=root -install_sapp=false -install_device_sn=false -install_device_tag=false - -[wangw] -192.168.40.137 - -[toroad] -192.168.40.133 -