From 885572f54aa314946dd90535f425e683af606190 Mon Sep 17 00:00:00 2001 From: Darko Lukic Date: Sun, 20 May 2018 16:26:39 +0200 Subject: [PATCH] Move AP configuration out of the package --- data_files/create_ap.conf | 28 ---------------------------- data_files/dhcpcd.conf | 22 ---------------------- data_files/dnsmasq.conf | 2 -- docs/publishing.md | 11 +++++++++++ setup.py | 8 +++----- 5 files changed, 14 insertions(+), 57 deletions(-) delete mode 100644 data_files/create_ap.conf delete mode 100644 data_files/dhcpcd.conf delete mode 100644 data_files/dnsmasq.conf create mode 100644 docs/publishing.md diff --git a/data_files/create_ap.conf b/data_files/create_ap.conf deleted file mode 100644 index b2b37a4..0000000 --- a/data_files/create_ap.conf +++ /dev/null @@ -1,28 +0,0 @@ -CHANNEL=default -GATEWAY=10.0.0.1 -WPA_VERSION=2 -ETC_HOSTS=0 -DHCP_DNS=gateway -NO_DNS=0 -NO_DNSMASQ=0 -HIDDEN=0 -MAC_FILTER=0 -MAC_FILTER_ACCEPT=/etc/hostapd/hostapd.accept -ISOLATE_CLIENTS=0 -SHARE_METHOD=nat -IEEE80211N=0 -IEEE80211AC=0 -HT_CAPAB=[HT40+] -VHT_CAPAB= -DRIVER=nl80211 -NO_VIRT=0 -COUNTRY= -FREQ_BAND=2.4 -NEW_MACADDR= -DAEMONIZE=0 -NO_HAVEGED=0 -WIFI_IFACE=wlan0 -INTERNET_IFACE=eth0 -SSID=CosmicPi -PASSPHRASE= -USE_PSK=0 diff --git a/data_files/dhcpcd.conf b/data_files/dhcpcd.conf deleted file mode 100644 index 32cee8a..0000000 --- a/data_files/dhcpcd.conf +++ /dev/null @@ -1,22 +0,0 @@ -#interface wlan0 -# static ip_address=192.168.12.1/24 - -hostname -clientid -presistent -option rapid_commit -option domain_name_servers, domain_name, domain_search, host_name -option classless_static_routes -option interface_mtu -option ntp_servers -require dhcp_server_identifier - -slaac private - -profile static_wlan0 -static ip_address=192.168.12.1 -static routers=192.168.12.1 -static domain_name_servers=192.168.12.1 - -interface wlan0 -fallback static_wlan0 \ No newline at end of file diff --git a/data_files/dnsmasq.conf b/data_files/dnsmasq.conf deleted file mode 100644 index b8d0ab2..0000000 --- a/data_files/dnsmasq.conf +++ /dev/null @@ -1,2 +0,0 @@ -interface=wlan0 # Use the require wireless interface - usually wlan0 - dhcp-range=192.168.12.50,192.168.12.150,255.255.255.0,24h \ No newline at end of file diff --git a/docs/publishing.md b/docs/publishing.md new file mode 100644 index 0000000..7f9685b --- /dev/null +++ b/docs/publishing.md @@ -0,0 +1,11 @@ +# Publishing the package + +## Python +CosmicPi is available as Python package at following URL: +https://pypi.org/project/cosmicpi/ + +In order to publish a new version of CosmicPi run following command: +``` +python setup.py sdist upload +``` +Note: Please make sure you have rights to publish to given URL. \ No newline at end of file diff --git a/setup.py b/setup.py index c5ef9cf..49f40b0 100644 --- a/setup.py +++ b/setup.py @@ -38,7 +38,6 @@ PREINSTALL = """ POSTINSTALL = """ echo "--- Setting up services" # Hope an OS uses systemd (not SysVinit or similar) - sudo systemctl daemon-reload sudo systemctl enable cosmicpi-mqtt.service sudo systemctl start cosmicpi-mqtt.service sudo systemctl enable cosmicpi-dbcleaner.service @@ -47,6 +46,7 @@ POSTINSTALL = """ sudo systemctl start cosmicpi-detector.service sudo systemctl enable cosmicpi-ui.service sudo systemctl start cosmicpi-ui.service + sudo systemctl daemon-reload echo "--- Finished setup! Rebooting now, when this is done your Cosmic Pi should start working ---" echo "--- To connect go to the IP address assigned by your network to the CosmicPi device, or ---" @@ -68,7 +68,7 @@ class PrePostInstall(install): setup(name='cosmicpi', - version='1.5.3', + version='1.5.4', description='UI for the CosmicPi cosmic ray detector', long_description='This software provides the user interface, temporary storage and connection to the internet storage for the detectors of the CosmicPi project. The Cosmic Pi project aims to build the world\'s largest open source distributed cosmic ray telescope. You too can be a part of the project, by becoming a Cosmic Pixel!', platforms=['noarch'], @@ -99,9 +99,7 @@ setup(name='cosmicpi', 'data_files/cosmicpi-dbcleaner.service', ]), ('/etc', [ - 'data_files/cosmicpi.config', - 'data_files/dhcpcd.conf', - 'data_files/dnsmasq.conf' + 'data_files/cosmicpi.config', ] ), ],