diff --git a/README.md b/README.md index 8a5be73..b0c3ea4 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,9 @@ Within Python Virtual Environment: 1. Run `pip install -r requirements.txt` to install needed Python libraries. -3. Run `python peers.py` to collect and store all needed data from your server peers.. +2. Run `python peers.py` to collect and store all needed data from your server peers. + +3. Edit `software.txt` file, add the software you want to block, one per line, and save it. 4. Run `python blocksoft.py` to block the configured software.. diff --git a/blocksoft.py b/blocksoft.py index 972d2c8..9606718 100644 --- a/blocksoft.py +++ b/blocksoft.py @@ -8,7 +8,6 @@ from psycopg2.extensions import ISOLATION_LEVEL_AUTOCOMMIT import getpass import fileinput,re import requests -import pdb class DomainBlocks(): @@ -481,13 +480,23 @@ if __name__ == '__main__': blocker = DomainBlocks() - software = 'birdsitelive' + soft_list = 'software.txt' + + soft_file = open(soft_list, 'r') + + Lines = soft_file.readlines() - servers_list = blocker.get_servers(software) + for software in Lines: - for server in servers_list: + software = software.replace('\n', '') - blocker.domain_blocks_create(server) + print(f'checking software {software}...') + + servers_list = blocker.get_servers(software) + + for server in servers_list: + + blocker.domain_blocks_create(server)