增加安装framework tasks; 修改安装free_radius依赖库安装顺序; 修复sentry update url; 公共库默认安装路径/opt/tsg/framefork .

deploy_env/group_vars/all.yml

@@ -12,7 +12,7 @@ wannat_global:
         vpn_client_ip_cidr: "10.10.120.0/24"
         vpn_server_ip_local: "10.10.120.1"
         vpn_client_ip_range: "10.10.120.2-254"
-        sentry_upload_key: "e8e446bb3bd8435c97f4c01770ca7025"
+        sentry_upload_url: "https://sentry.mesalab.cn/api/3/minidump/?sentry_key=xxxxx"
         
     natgw:
         device: "eth0"
@@ -22,7 +22,7 @@ wannat_global:
         location_compare_type: 0
         country_location:  "Set_your_geographic_location_here"
         province_location: "Set_your_geographic_location_here"
-        ctrl_device_ip_addr: "192.168.40.134"
+        ctrl_device_ip_addr: "172.26.121.58"
 
     toroad:
         http_server_listen_port: 8888

roles/framework/files/framework.conf

@@ -0,0 +1 @@
+/opt/tsg/framework/lib/

roles/framework/files/framework.sh

@@ -0,0 +1 @@
+export PATH=/opt/tsg/framework/bin:$PATH

roles/framework/tasks/main.yml

@@ -0,0 +1,32 @@
+---
+- name: "mkdir /opt/tsg/framework/lib"
+  file:
+    path: /opt/tsg/framework/lib/
+    state: directory
+    
+- name: "copy framework rpms to destination server"
+  copy:
+    src: "{{ role_path }}/files/rpm"
+    dest: "/tmp/"
+    
+- name: "Install framework rpms"
+  shell: rpm --nodeps --replacepkgs -i /tmp/rpm/*.rpm --prefix /opt/tsg/framework   
+  args:
+    warn: false
+    
+- name: "mkdir /etc/ld.so.conf.d/"
+  file:
+    path: /etc/ld.so.conf.d/
+    state: directory
+
+- name: "copy framework.conf to destination server"
+  copy:
+    src: "{{ role_path }}/files/framework.conf"
+    dest: /etc/ld.so.conf.d/ 
+
+- name: "copy framework.sh to destination for execute files of framework"
+  copy:
+    src: "{{ role_path }}/files/framework.sh"
+    dest: /etc/profile.d/
+    mode: 0755
+    

roles/libwire_graft/tasks/main.yml

@@ -1,22 +1,23 @@
 ---
-- name: "Creates /opt/MESA/lib directory"
+- name: "Creates /opt/tsg/framework  directory"
   file:
-    path: /opt/MESA/lib
+    path: /opt/tsg/framework/lib
     state: directory
     
-- name: "copy wiregraft_devel_rpm_file to destination server"
-  synchronize:
+- name: "copy libwiregraft_rpm_file to destination server"
+  copy:
     src: "{{ role_path }}/files/rpm/{{ wannat_global.rpm_files.wire_graft_rpm_file }}"
     dest: "/tmp/"
 
-- name: "install wiregraft_devel"
-  yum:
-    name: "{{ packages }}"
-    state: present
-  vars:
-    packages:
-    - /tmp/{{ wannat_global.rpm_files.wire_graft_rpm_file }}        
-    
+- name: "install libwiregraft"
+  shell: rpm --nodeps --replacepkgs -i /tmp/{{ wannat_global.rpm_files.wire_graft_rpm_file }} --prefix /opt/tsg/framework   
+  args:
+    warn: false    
+
+- name: "ldconfig"
+  shell: ldconfig  
+  args:
+    warn: false    
     
 
 

roles/natgw/tasks/main.yml

@@ -1,6 +1,6 @@
 ---
 - name: "copy natgw_rpm_file to destination server"
-  synchronize:
+  copy:
     src: "{{ role_path }}/files/rpm/{{ wannat_global.rpm_files.natgw_rpm_file }}"
     dest: "/tmp/"
     

roles/natgw/templates/natgw.conf.j2

@@ -36,3 +36,17 @@ Maat_redis_ip={{wannat_global.common.redis_server_ip}}
 Maat_redis_port={{wannat_global.common.redis_server_port}}
 Maat_redis_index={{wannat_global.common.redis_index}}
 
+
+[BREAKPAD]
+ disable_coredump=0
+ enable_breakpad=1
+ breakpad_minidump_dir="/tmp/crashreport"
+ enable_breakpad_upload=1
+ breakpad_upload_url="{{wannat_global.common.sentry_upload_url}}"
+
+[ACCESS_SERVERS]
+port=8000
+l3_sysemd_service_name=pptpd
+url_path=/v1/wannat/access_servers
+
+

roles/openvpn/tasks/main.yml

@@ -1,16 +1,16 @@
 ---
 - name: "copy openvpn_rpm_file to destination server"
-  synchronize:
+  copy:
     src: "{{ role_path }}/files/{{ wannat_global.rpm_files.openvpn_rpm_file }}"
     dest: "/tmp/"
 
 - name: "copy radius_client_rpm_file to destination server"
-  synchronize:
+  copy:
     src: "{{ role_path }}/../radius_rpm_files/{{ wannat_global.rpm_files.radius_client_rpm_file }}"
     dest: "/tmp/"
 
 - name: "copy easy_rsa to destination server"
-  synchronize:
+  copy:
     src: "{{ role_path }}/files/{{ wannat_global.rpm_files.easy_rsa_rpm_file }}"
     dest: "/tmp/"
     
@@ -54,28 +54,28 @@
     state: directory
 
 - name: "copy radiusplugin.so to destination server"
-  synchronize:
+  copy:
     src: "{{ role_path }}/files/radiusplugin.so"
     dest: "/etc/openvpn/server/radius/radiusplugin.so"
 
 - name: "copy ca.crt to destination server"
-  synchronize:
+  copy:
     src: "{{ role_path }}/files/ca.crt"
     dest: "/etc/openvpn/server/ca.crt"
 
 - name: "copy server.key to destination server"
-  synchronize:
+  copy:
     src: "{{ role_path }}/files/server.key"
     dest: "/etc/openvpn/server/server.key"
 
 
 - name: "copy server.crt to destination server"
-  synchronize:
+  copy:
     src: "{{ role_path }}/files/server.crt"
     dest: "/etc/openvpn/server/server.crt"
 
 - name: "copy dh.pem to destination server"
-  synchronize:
+  copy:
     src: "{{ role_path }}/files/dh.pem"
     dest: "/etc/openvpn/server/dh.pem"
 

roles/pptpd/tasks/main.yml

@@ -1,11 +1,11 @@
 ---
 - name: "copy ppp_rpm_file to destination server"
-  synchronize:
+  copy:
     src: "{{ role_path }}/files/{{ wannat_global.rpm_files.ppp_rpm_file }}"
     dest: "/tmp/"
 
 - name: "copy ppptpd_rpm_file to destination server"
-  synchronize:
+  copy:
     src: "{{ role_path }}/files/{{ wannat_global.rpm_files.pptpd_rpm_file }}"
     dest: "/tmp/"
     

roles/radius_client/tasks/main.yml

@@ -1,6 +1,6 @@
 ---
 - name: "copy radiusclient-ng to destination server"
-  synchronize:
+  copy:
     src: "{{ role_path }}/../radius_rpm_files/{{ wannat_global.rpm_files.radius_client_rpm_file }}"
     dest: "/tmp/"
 

roles/radius_server/tasks/main.yml

@@ -1,71 +1,44 @@
 ---
 - name: "copy freeradius to destination server"
-  synchronize:
+  copy:
     src: "{{ role_path }}/../radius_rpm_files/freeradius-3.0.13-15.el7.x86_64.rpm"
     dest: "/tmp/"
 
 - name: "copy freeradius-mysql to destination server"
-  synchronize:
+  copy:
     src: "{{ role_path }}/../radius_rpm_files/freeradius-mysql-3.0.13-15.el7.x86_64.rpm"
     dest: "/tmp/"
 
 - name: "copy freeradius-utils to destination server"
-  synchronize:
+  copy:
     src: "{{ role_path }}/../radius_rpm_files/freeradius-utils-3.0.13-15.el7.x86_64.rpm"
     dest: "/tmp/"
 
 - name: "copy log4cxx to destination server"
-  synchronize:
+  copy:
     src: "{{ role_path }}/../radius_rpm_files/log4cxx-0.10.0-16.el7.x86_64.rpm"
     dest: "/tmp/"
 
 - name: "copy tncfhh to destination server"
-  synchronize:
+  copy:
     src: "{{ role_path }}/../radius_rpm_files/tncfhh-0.8.3-16.el7.x86_64.rpm"
     dest: "/tmp/"
 
 - name: "copy tncfhh-libs to destination server"
-  synchronize:
+  copy:
     src: "{{ role_path }}/../radius_rpm_files/tncfhh-libs-0.8.3-16.el7.x86_64.rpm"
     dest: "/tmp/"
 
 - name: "copy tncfhh-utils to destination server"
-  synchronize:
+  copy:
     src: "{{ role_path }}/../radius_rpm_files/tncfhh-utils-0.8.3-16.el7.x86_64.rpm"
     dest: "/tmp/"
 
 - name: "copy xerces to destination server"
-  synchronize:
+  copy:
     src: "{{ role_path }}/../radius_rpm_files/xerces-c-3.1.1-10.el7_7.x86_64.rpm"
     dest: "/tmp/"
 
-
-    
-- name: "install freeradius"
-  yum:
-    name: "{{ packages }}"
-    state: present
-  vars:
-    packages:
-    - /tmp/freeradius-3.0.13-15.el7.x86_64.rpm    
-
-- name: "install freeradius-mysql"
-  yum:
-    name: "{{ packages }}"
-    state: present
-  vars:
-    packages:
-    - /tmp/freeradius-mysql-3.0.13-15.el7.x86_64.rpm 
-
-- name: "install freeradius-utils"
-  yum:
-    name: "{{ packages }}"
-    state: present
-  vars:
-    packages:
-    - /tmp/freeradius-utils-3.0.13-15.el7.x86_64.rpm
-
-
 - name: "install log4cxx"
   yum:
     name: "{{ packages }}"
@@ -106,6 +79,30 @@
     packages:
     - /tmp/xerces-c-3.1.1-10.el7_7.x86_64.rpm
 
+- name: "install freeradius-utils"
+  yum:
+    name: "{{ packages }}"
+    state: present
+  vars:
+    packages:
+    - /tmp/freeradius-utils-3.0.13-15.el7.x86_64.rpm
+
+- name: "install freeradius"
+  yum:
+    name: "{{ packages }}"
+    state: present
+  vars:
+    packages:
+    - /tmp/freeradius-3.0.13-15.el7.x86_64.rpm    
+
+- name: "install freeradius-mysql"
+  yum:
+    name: "{{ packages }}"
+    state: present
+  vars:
+    packages:
+    - /tmp/freeradius-mysql-3.0.13-15.el7.x86_64.rpm 
+
 - name: "Creates /etc/raddb"
   file:
     path: /etc/raddb
@@ -179,7 +176,7 @@
 #    src: "{{ role_path }}/templates/sites-available/default.j2"
 #    dest:  /etc/raddb/sites-available/default
 #  tags: template
-  synchronize:
+  copy:
     src: "{{ role_path }}/templates/sites-available/default"
     dest: "/etc/raddb/sites-available/"  
   

roles/toroad/tasks/main.yml

@@ -10,7 +10,7 @@
     state: directory   
     
 - name: "copy toroad_rpm_file to destination server"
-  synchronize:
+  copy:
     src: "{{ role_path }}/files/rpm/{{ wannat_global.rpm_files.toroad_rpm_file }}"
     dest: "/tmp/"
 

roles/toroad/templates/toroad.conf.j2

@@ -41,4 +41,5 @@ disable_coredump=1
 enable_breakpad=1
 breakpad_minidump_dir="/tmp/crashreport"
 enable_breakpad_upload=1
-breakpad_upload_url="https://sentry.mesalab.cn/api/3/minidump/?sentry_key=xxxxxx"
+breakpad_upload_url="{{wannat_global.common.sentry_upload_url}}"
+

wannat-install.yml

@@ -1,4 +1,10 @@
 ---
+- hosts: natgw
+  roles:
+    - framework
+  vars_files:
+    - deploy_env/group_vars/all.yml
+    
 - hosts: natgw
   roles:
     - libwire_graft