diff --git a/.gitignore b/.gitignore index 5f724cf..ea543a5 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /.log/ +tmp/ diff --git a/ansible/ansible.cfg b/ansible/ansible.cfg new file mode 100644 index 0000000..eb870e3 --- /dev/null +++ b/ansible/ansible.cfg @@ -0,0 +1,2 @@ +[defaults] +inventory = ./inventory.ini diff --git a/ansible/playbooks/frps.yaml b/ansible/playbooks/frps.yaml index 35ec5fe..3a4726e 100644 --- a/ansible/playbooks/frps.yaml +++ b/ansible/playbooks/frps.yaml @@ -6,8 +6,9 @@ vars: frp_version: "0.71.0" frp_download_url: "https://github.com/fatedier/frp/releases/download/v{{ frp_version }}/frp_{{ frp_version }}_linux_amd64.tar.gz" - frp_local_archive: "/tmp/frp_{{ frp_version }}_linux_amd64.tar.gz" - frp_local_tmp_dir: "/tmp/frp_{{ frp_version }}_linux_amd64" + frp_tmp_dir: "{{ playbook_dir }}/../tmp" + frp_local_archive: "{{ frp_tmp_dir }}/frp_{{ frp_version }}_linux_amd64.tar.gz" + frp_local_tmp_dir: "{{ frp_tmp_dir }}/frp_{{ frp_version }}_linux_amd64" frp_install_dir: "/opt/frp" frp_config_dir: "/etc/frp" vars_files: @@ -43,7 +44,7 @@ - name: 解压 frp 压缩包到本地 unarchive: src: "{{ frp_local_archive }}" - dest: "/tmp/" + dest: "{{ frp_tmp_dir }}" creates: "{{ frp_local_tmp_dir }}" delegate_to: localhost run_once: true diff --git a/ansible/templates/frps.toml.j2 b/ansible/templates/frps.toml.j2 index f027098..4833578 100644 --- a/ansible/templates/frps.toml.j2 +++ b/ansible/templates/frps.toml.j2 @@ -1,12 +1,11 @@ bindPort = {{ vault_frps_bind_port }} vhostHTTPPort = {{ vault_frps_vhost_http_port }} -vhostHTTPSPort = {{ vault_frps_vhost_https_port }} auth.method = "token" auth.token = "{{ vault_frps_token }}" -webServer.addr = "0.0.0.0" +webServer.addr = "127.0.0.1" webServer.port = {{ vault_frps_dashboard_port }} webServer.user = "{{ vault_frps_dashboard_user }}" webServer.password = "{{ vault_frps_dashboard_password }}" diff --git a/ansible/tmp/.keep b/ansible/tmp/.keep new file mode 100644 index 0000000..e69de29 diff --git a/ansible/vars/vault.yaml b/ansible/vars/vault.yaml index e81828a..8b2aa37 100644 --- a/ansible/vars/vault.yaml +++ b/ansible/vars/vault.yaml @@ -1,34 +1,33 @@ $ANSIBLE_VAULT;1.1;AES256 -31623833356637343262363863626534323535626238346439333262633332633136633261306466 -6236333066363461326664306262633937323864306462370a333631643039653664643662366234 -30643231336631313930663637396537663162623938363263336333343262376561323765356630 -6332383136383336640a336536316566393461666463616265363830383331363838613839636338 -63666365333233646533303166316333393535313466393832643966306331666434333065333238 -37633735313832366131653833363762393265656439663135376265366466333838623761646535 -64633236663738653233633566633734306138393462383532306436373537343332343565356466 -62386664373631336138396134613833636232663936363963656638353133386430376631383438 -35313866343438636564373566373239656233376432363362613466356334346339616562316530 -62306361646362353631336134326136346663623061643231666433353265653736323162616166 -32313132643832306563623861393735623439376432346136623732353737356338616432316161 -64316436653531356362316366383039616465313233393663663566316532626138363936363736 -31386237653634343236326639376531653465636233636662303037643930633661623338356537 -34636639383662646234313037363230373333333731323666383232626330663561396330356361 -36346537376431333235393938636664306532373863353862663166613862363165643433626361 -37616337356538373733313130633334353436643437366534326636616539316166336137346461 -63633130623436316463623461353762313533636262653262393930666434386664326464636562 -35636233656365616332383565623230353062663236316437333830626463333366633230393432 -33386533346436623132313036646536366339646333643732633133626631396463653533363763 -37623439303931363933336432386430336662353138663231316436356535373831653232633562 -33626463303134323032643535373038303530376632393162356630613134396261633661393335 -30646133366166313533666565326335656231663864666333366136616264356535303033313832 -35323432613063356161383365653964613339346136333363363763316463396364383264343634 -65623039343064356430386662323135303134306539313138316633396635333331636137356665 -38623531613138316162353733663631396562313033393066303266396533613762643936663936 -65663762646264616439666138636364343264323961343739336330663237666661303639363835 -63636562636336613665366533333563323239633338663738363931383333356264313166393132 -30643636303333616161346166323933623432613633643965313366643565343931633338303237 -35636365333262386135623866343839313836616664663764323938636630393062383462343437 -32636664663635643934396166373462303638343437623961373362366230633466363936326162 -38303130346439323863643836666565326530363362306432623036303562636532333966386463 -31353063363839633736366133353535643064363461653030346432393461623666616666643231 -63333831653963356632316333396130653934653134623339323438653638643031 +66663436363739383134313731346531623330346566326665386432313337326465356131333431 +3163636630313866616338646337643134386564376430630a336364626338613031313635346430 +64373039396132633361323438306630306663333066633733643266376138636537366336343439 +3131323430616566370a343661313836333635326131653536313063626264366239323033323931 +32656230306137373039636537373435663234363665646463626138626639643035383638373734 +63323138396365643861383235326262356536623138663035373437366131383430636339363461 +62303365396538633766353339643864633736323863666436373464376565303835383663396232 +37653239613663653632323232313331353736643935333437313563346463336165333331376433 +37646466623764306138363762663362656237653339373061633765653234363166366132306438 +33356333343234363165653635626632306531653464636462373738623330306162363861306661 +39353530663763363865336435343334336638373135313539663730323732393533306362303934 +34396632356436393234383761613539393235643936323563336531623763323565333865633134 +39393733363463336362333266333035326439613438306435336135346366336264376433393930 +35383539653863656338383666336263653333383133383738666235306563396637396664303936 +37306538626231336535656266663362343166386531613137616430666433663236343265626266 +64363334366564653665663837376238396665653663646139346536636530326261323035616362 +32306465633731313731623533323938303533376336313039656662656534643338353139663636 +33383966613430316333333630353232336461333130643634663237633835356433636661316432 +65666434616534313736393736646330363963613235333030346461626662313635656238346638 +34326263363131356465373066316464366532343165373466656132386433363466633237636432 +38383636653061396263373639643037656462623636323938353631396431663964323131636166 +65383236393961396630353963303562363535376665666136346466666236366333393564633432 +65353136663930643364343134623066623035363862366564623931663362653161653934303665 +66643234343138343866623163373033626462666263656535643830613837333632653962333231 +31393565386631353635383834366465613137623836313362663032393831653164626131393163 +39663636346163366533363063643232326537363936613362633031643863373838363330616330 +39386461333263356139346261633933636235623831333630326662616630646166323763663031 +64333735633633323030303030636539323235623833383832313935376430346365613864373038 +30653935333434353233373735313433376535616238383330306535306563326563316663333461 +37636262356334633836623763613338363237666535376361363237363562353037366262333562 +33393633386637616531376166623536336564343630643632313961636632393438636136383236 +39623838393432636631