diff --git a/facebook/accs_to_db.py b/facebook/accs_to_db.py index 01887ea..db3d0f4 100644 --- a/facebook/accs_to_db.py +++ b/facebook/accs_to_db.py @@ -6,12 +6,10 @@ from time import sleep import base64 import json import requests -from sshtunnel import open_tunnel -import paramiko -from getpass import getpass -import arangodb + import config from helpers import now +import dbViaSSH # Gör fb-scraper till arbetsmapp chdir(dirname(dirname(abspath(__file__)))) @@ -268,26 +266,15 @@ if __name__ == "__main__": row = row.replace("https:", "https;") data.append(row.split(sep)) - # Lägg in i accs - # Öppna SSH-tunnel till RBP/db. - pwd_key = getpass("Password for rsa-key: ") - with open_tunnel( - ("studio-garda.asuscomm.com", 2210), - ssh_username="lasse", - ssh_pkey=paramiko.RSAKey.from_private_key_file( - "/Users/Lasse/.ssh/id_rsa", password=pwd_key - ), - ssh_private_key_password=pwd_key, - remote_bind_address=("127.0.0.1", 8529), - ) as server: - port_arango = server.local_bind_port - - db = arangodb.arango_connect( - "concert-hangar-mirth-salk-DECAL", - username="Accs", - host_arango="http://127.0.0.1", - port_arango=port_arango, - ) - #webshare_proxies() - - to_accs(db, data, info, profiles, vendor) + # # Lägg in i accs + + db = dbViaSSH.db_over_tunnel('Accs') + + #webshare_proxies() + + to_accs(db, data, info, profiles, vendor) + + dbViaSSH.stop_server() + + + diff --git a/facebook/config.py b/facebook/config.py index 91c4e90..713e569 100644 --- a/facebook/config.py +++ b/facebook/config.py @@ -11,6 +11,7 @@ user_arango = "Lasse" db_arango = "facebook" host_arango = 'http://192.168.1.10' port_arango = '8529' +host_adress = "studio-garda.asuscomm.com" #IP/adress till där db finns # Andra uppgifter url_bas = "https://mbasic.facebook.com"