Skip to content

Commit 113bcef

Browse files
weizhouapachedhslove
authored andcommitted
VR: remove vpn user info when apply vpn users list (apache#9568)
Prior to this PR ``` root@r-663-VM:/var/cache/cloud# gzip -dk vpn_user_list.json.aae73e2c-32ba-44f3-bf47-426933a67bcb.gz root@r-663-VM:/var/cache/cloud# /opt/cloud/bin/update_config.py vpn_user_list.json.aae73e2c-32ba-44f3-bf47-426933a67bcb {'id': 'vpnuserlist', 'test': {'add': True, 'password': 'test', 'user': 'test'}} {'vpn_users': [{'user': 'test', 'password': 'test', 'add': True}], 'type': 'vpnuserlist', 'delete_from_processed_cache': False} line = # Secrets for authentication using CHAP line = # client server secret IP addresses line = line = line = test * test * ``` with this PR ``` root@r-663-VM:/var/cache/cloud# gzip -dk vpn_user_list.json.aae73e2c-32ba-44f3-bf47-426933a67bcb.gz root@r-663-VM:/var/cache/cloud# /opt/cloud/bin/update_config.py vpn_user_list.json.aae73e2c-32ba-44f3-bf47-426933a67bcb root@r-663-VM:/var/cache/cloud# ```
1 parent d178f0c commit 113bcef

2 files changed

Lines changed: 0 additions & 3 deletions

File tree

systemvm/debian/opt/cloud/bin/cs/CsFile.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,6 @@ def searchString(self, search, ignoreLinesStartWith):
153153
logging.debug("Searching for %s string " % search)
154154

155155
for index, line in enumerate(self.new_config):
156-
print(' line = ' + line)
157156
if line.lstrip().startswith(ignoreLinesStartWith):
158157
continue
159158
if search in line:

systemvm/debian/opt/cloud/bin/cs_vpnusers.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@
2222
def merge(dbag, data):
2323
dbagc = copy.deepcopy(dbag)
2424

25-
print(dbag)
26-
print(data)
2725
if "vpn_users" not in data:
2826
return dbagc
2927

0 commit comments

Comments
 (0)