Skip to content

Commit 2dfd846

Browse files
committed
rework configure-interfaces.py to system-quickstart.py
1 parent 9d583aa commit 2dfd846

File tree

16 files changed

+410
-793
lines changed

16 files changed

+410
-793
lines changed

docs/malcolm-hedgehog-e2e-iso-install.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ Alternatively, to configure a network interface with a static IP address (recomm
171171

172172
### <a name="MalcolmTimeSync"></a> Configure Hostname and Time Sync
173173

174-
If users wish to change Malcolm's hostname or configure system time synchronization, they can open a terminal (the icon immediately to the right of the **Applications** menu icon at the top of the Malcolm desktop) and run `configure-interfaces` then enter the user (if the user is part of the `sudo` group) or `root` password.
174+
If users wish to change Malcolm's hostname or configure system time synchronization, they can open a terminal (the icon immediately to the right of the **Applications** menu icon at the top of the Malcolm desktop) and run `system-quickstart` then enter the user (if the user is part of the `sudo` group) or `root` password.
175175

176176
Here users can configure Malcolm to keep its time synchronized with either an NTP server (using the NTP protocol), another [Malcolm]({{ site.github.repository_url }}) aggregator or another HTTP/HTTPS server. On the next dialog, choose the time synchronization method to configure.
177177

@@ -614,7 +614,7 @@ The panel bordering the top of the Malcolm desktop is home to a number of useful
614614

615615
## <a name="HedgehogInterfaces"></a> Configure Hostname, Interfaces and Time Sync
616616

617-
The first step of sensor configuration is to configure the network interfaces and sensor hostname. Clicking the **Configure Interfaces and Hostname** toolbar icon (or running `configure-interfaces` at a command line prompt) will prompt for the root password created during installation, after which the configuration welcome screen is shown. Select **Continue** to proceed.
617+
The first step of sensor configuration is to configure the network interfaces and sensor hostname. Clicking the **Configure Interfaces and Hostname** toolbar icon (or running `system-quickstart` at a command line prompt) will prompt for the root password created during installation, after which the configuration welcome screen is shown. Select **Continue** to proceed.
618618

619619
Users may next select whether to configure the network interfaces, hostname, or time synchronization.
620620

docs/time-sync.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# <a name="ConfigTime"></a>Time synchronization
22

3-
If you wish to set up time synchronization via [NTP](http://www.ntp.org/) or `htpdate`, open a terminal and run `sudo configure-interfaces.py`. Select **Continue**, then choose **Time Sync**. Here you can configure the operating system to keep its time synchronized with either an NTP server (using the NTP protocol), another Malcolm instance, or another HTTP/HTTPS server. On the next dialog, choose the time synchronization method you wish to configure.
3+
If you wish to set up time synchronization via [NTP](http://www.ntp.org/) or `htpdate`, open a terminal and run `system-quickstart`. Select **Continue**, then choose **Time Sync**. Here you can configure the operating system to keep its time synchronized with either an NTP server (using the NTP protocol), another Malcolm instance, or another HTTP/HTTPS server. On the next dialog, choose the time synchronization method you wish to configure.
44

55
If **htpdate** is selected, you will be prompted to enter the IP address or hostname and port of an HTTP/HTTPS server (for a Malcolm instance, port `9200` may be used) and the time synchronization check frequency in minutes. A test connection will be made to determine if the time can be retrieved from the server.
66

hedgehog-iso/config/hooks/normal/0910-sensor-build.hook.chroot

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,6 @@ if [[ ! "${ARCH,,}" =~ ^arm ]]; then
134134
!/root(/|$)
135135
!/run(/|$)
136136
!/tmp(/|$)
137-
!/usr/local/lib/python.*/dist-packages/debinterface(/|$)
138137
!/var/backups(/|$)
139138
!/var/cache(/|$)
140139
!/var/lib/AccountsService(/|$)

hedgehog-iso/config/includes.chroot/etc/bash.bash_aliases

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# some more ls aliases
22

33
# sensor
4-
alias configure-interfaces="su -l -c /usr/local/bin/configure-interfaces.py"
4+
alias system-quickstart="su -l -c /usr/local/bin/system-quickstart.py"
55
alias configure-capture="/usr/local/bin/configure-capture.py"
66

77
#safety
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
[Desktop Entry]
22
Version=1.0
3-
Name=Configure Interfaces and Hostname
4-
Exec=/usr/bin/tilix --maximize -t "Configure Interfaces and Hostname" -e su -l -c /usr/local/bin/configure-interfaces.py
3+
Name=System Quickstart
4+
Exec=/usr/bin/tilix --maximize -t "System Quickstart" -e su -l -c /usr/local/bin/system-quickstart.py
55
Terminal=false
66
X-MultipleArgs=false
77
Type=Application
88
Icon=network-wired
99
Categories=Network;
1010
StartupNotify=true
11-
X-XFCE-Source=file:///usr/share/applications/configure-interfaces.desktop
11+
X-XFCE-Source=file:///usr/share/applications/system-quickstart.desktop

hedgehog-iso/config/includes.chroot/usr/share/applications/configure-interfaces.desktop

Lines changed: 0 additions & 10 deletions
This file was deleted.
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
[Desktop Entry]
2+
Version=1.0
3+
Name=System Quickstart
4+
Exec=/usr/bin/tilix --maximize -t "System Quickstart" -e su -l -c /usr/local/bin/system-quickstart.py
5+
Terminal=false
6+
X-MultipleArgs=false
7+
Type=Application
8+
Icon=network-wired
9+
Categories=Network;
10+
StartupNotify=true

hedgehog-iso/config/requirements.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
clamd==1.0.2
22
dateparser==1.2.2
3-
debinterface==3.5.0
43
dominate==2.9.1
54
git+https://github.com/mmguero-dev/mandiant-ti-client
65
git+https://github.com/mmguero-dev/python-humanfriendly.git

malcolm-iso/config/hooks/normal/0910-agg-build.hook.chroot

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ cat << 'EOF' >> /etc/aide/aide.conf.d/00_local_excludes
5252
!/root(/|$)
5353
!/run(/|$)
5454
!/tmp(/|$)
55-
!/usr/local/lib/python.*/dist-packages/debinterface(/|$)
5655
!/var/backups(/|$)
5756
!/var/cache(/|$)
5857
!/var/lib/AccountsService(/|$)

malcolm-iso/config/includes.chroot/etc/bash.bash_functions

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -533,11 +533,11 @@ function dregls () {
533533
########################################################################
534534
# malcolm-specific
535535
########################################################################
536-
configure-interfaces() {
536+
system-quickstart() {
537537
if groups | grep -q '\bsudo\b'; then
538-
sudo /usr/local/bin/configure-interfaces.py
538+
sudo /usr/local/bin/system-quickstart.py
539539
else
540-
su -l -c /usr/local/bin/configure-interfaces.py
540+
su -l -c /usr/local/bin/system-quickstart.py
541541
fi
542542
}
543543

0 commit comments

Comments
 (0)