h3n3/kiauh
1
0
Fork 0
Code Issues 46 Pull Requests 10 Packages Projects Releases Wiki Activity

feat: KIAUH v4.0.0 #191

Merged
dw-0 merged 453 commits from v4-rc into master 2022-05-29 20:11:16 +02:00
Conversation 8 Commits 453 Files Changed 64 +7 -36
4 changed files with 7 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 4c6885ec90 - Show all commits

2
scripts/fluidd.sh
View File

@@ -27,7 +27,7 @@ function install_fluidd() {
dependency_check "${dep[@]}"
### check if moonraker is already installed
system_check_webui
### ask user how to handle Haproxy, Lighttpd, Apache2 if found
### ask user how to handle Haproxy, Apache2 if found
process_services_dialog
### process possible disruptive services
process_disruptive_services

2
scripts/mainsail.sh
View File

@@ -27,7 +27,7 @@ function install_mainsail() {
dependency_check "${dep[@]}"
### check if moonraker is already installed
system_check_webui
### ask user how to handle Haproxy, Lighttpd, Apache2 if found
### ask user how to handle Haproxy, Apache2 if found
process_services_dialog
### process possible disruptive services
process_disruptive_services

35
scripts/nginx.sh
View File

@@ -171,26 +171,6 @@ function process_disruptive_services() {
fi
fi
### handle lighttpd service
if [[ ${DISABLE_LIGHTTPD} == "true" || ${REMOVE_LIGHTTPD} == "true" ]]; then
if systemctl is-active lighttpd -q; then
status_msg "Stopping lighttpd service ..."
sudo systemctl stop lighttpd && ok_msg "Service stopped!"
fi
### disable lighttpd
if [[ ${DISABLE_LIGHTTPD} == "true" ]]; then
status_msg "Disabling lighttpd ..."
sudo systemctl disable lighttpd && ok_msg "Lighttpd service disabled!"
### remove lighttpd
if [[ ${REMOVE_LIGHTTPD} == "true" ]]; then
status_msg "Removing lighttpd ..."
sudo apt-get remove lighttpd -y && sudo update-rc.d -f lighttpd remove && ok_msg "Lighttpd removed!"
fi
fi
fi
### handle apache2 service
if [[ ${DISABLE_APACHE2} == "true" || ${REMOVE_APACHE2} == "true" ]]; then
if systemctl is-active apache2 -q; then
@@ -198,12 +178,12 @@ function process_disruptive_services() {
sudo systemctl stop apache2 && ok_msg "Service stopped!"
fi
### disable lighttpd
### disable apache2
if [[ ${DISABLE_APACHE2} == "true" ]]; then
status_msg "Disabling lighttpd ..."
status_msg "Disabling apache2 service ..."
sudo systemctl disable apache2 && ok_msg "Apache2 service disabled!"
### remove lighttpd
### remove apache2
if [[ ${REMOVE_APACHE2} == "true" ]]; then
status_msg "Removing apache2 ..."
sudo apt-get remove apache2 -y && sudo update-rc.d -f apache2 remove && ok_msg "Apache2 removed!"
@@ -213,8 +193,8 @@ function process_disruptive_services() {
}
function process_services_dialog() {
#notify user about haproxy or lighttpd services found and possible issues
if [[ ${HAPROXY_FOUND} == "true" || ${LIGHTTPD_FOUND} == "true" || ${APACHE2_FOUND} == "true" ]]; then
#notify user about haproxy or apache2 services found and possible issues
if [[ ${HAPROXY_FOUND} == "true" || ${APACHE2_FOUND} == "true" ]]; then
while true; do
echo
top_border
@@ -223,9 +203,6 @@ function process_services_dialog() {
if [[ ${HAPROXY_FOUND} == "true" ]]; then
echo -e "| ● haproxy |"
fi
if [[ ${LIGHTTPD_FOUND} == "true" ]]; then
echo -e "| ● lighttpd |"
fi
if [[ ${APACHE2_FOUND} == "true" ]]; then
echo -e "| ● apache2 |"
fi
@@ -244,13 +221,11 @@ function process_services_dialog() {
1)
echo -e "###### > Remove packages"
REMOVE_HAPROXY="true"
REMOVE_LIGHTTPD="true"
REMOVE_APACHE2="true"
break;;
2)
echo -e "###### > Disable only"
DISABLE_HAPROXY="true"
DISABLE_LIGHTTPD="true"
DISABLE_APACHE2="true"
break;;
3)

4
scripts/utilities.sh
View File

@@ -452,10 +452,6 @@ function system_check_webui() {
clee commented 2022-05-04 07:21:48 +02:00 (Migrated from github.com)
Review
Copy Link
    sudo cp "/etc/hosts" "/etc/hosts.${current_date}.bak"
```suggestion sudo cp "/etc/hosts" "/etc/hosts.${current_date}.bak" ```
clee commented 2022-05-04 07:21:48 +02:00 (Migrated from github.com)
Review
Copy Link
    sudo cp "/etc/hosts" "/etc/hosts.${current_date}.bak"
```suggestion sudo cp "/etc/hosts" "/etc/hosts.${current_date}.bak" ```
clee commented 2022-05-04 07:23:45 +02:00 (Migrated from github.com)
Review
Copy Link

I had to make this change in order to fix the error I got when I attempted to change the hostname (4/advanced, 7/change hostname from the menus) on armbian-22.05-trunk.

###### Creating backup of hosts file ...
cp: missing destination file operand after '/etc/hosts /etc/hosts.220503-2314.bak'
Try 'cp --help' for more information.
I had to make this change in order to fix the error I got when I attempted to change the hostname (4/advanced, 7/change hostname from the menus) on armbian-22.05-trunk. ``` ###### Creating backup of hosts file ... cp: missing destination file operand after '/etc/hosts /etc/hosts.220503-2314.bak' Try 'cp --help' for more information. ```
clee commented 2022-05-04 07:23:45 +02:00 (Migrated from github.com)
Review
Copy Link

I had to make this change in order to fix the error I got when I attempted to change the hostname (4/advanced, 7/change hostname from the menus) on armbian-22.05-trunk.

###### Creating backup of hosts file ...
cp: missing destination file operand after '/etc/hosts /etc/hosts.220503-2314.bak'
Try 'cp --help' for more information.
I had to make this change in order to fix the error I got when I attempted to change the hostname (4/advanced, 7/change hostname from the menus) on armbian-22.05-trunk. ``` ###### Creating backup of hosts file ... cp: missing destination file operand after '/etc/hosts /etc/hosts.220503-2314.bak' Try 'cp --help' for more information. ```
dw-0 commented 2022-05-05 10:14:01 +02:00 (Migrated from github.com)
Review
Copy Link

Thank you! Yes that was indeed a typo and i just fixed it.

Thank you! Yes that was indeed a typo and i just fixed it.
dw-0 commented 2022-05-05 10:14:01 +02:00 (Migrated from github.com)
Review
Copy Link

Thank you! Yes that was indeed a typo and i just fixed it.

Thank you! Yes that was indeed a typo and i just fixed it.
[[ $(dpkg-query -f'${Status}' --show haproxy 2>/dev/null) = *\ installed ]] && \
HAPROXY_FOUND="true"
### check system for an installed lighttpd service
clee commented 2022-05-04 07:21:48 +02:00 (Migrated from github.com)
Review
Copy Link
    sudo cp "/etc/hosts" "/etc/hosts.${current_date}.bak"
```suggestion sudo cp "/etc/hosts" "/etc/hosts.${current_date}.bak" ```
clee commented 2022-05-04 07:23:45 +02:00 (Migrated from github.com)
Review
Copy Link

I had to make this change in order to fix the error I got when I attempted to change the hostname (4/advanced, 7/change hostname from the menus) on armbian-22.05-trunk.

###### Creating backup of hosts file ...
cp: missing destination file operand after '/etc/hosts /etc/hosts.220503-2314.bak'
Try 'cp --help' for more information.
I had to make this change in order to fix the error I got when I attempted to change the hostname (4/advanced, 7/change hostname from the menus) on armbian-22.05-trunk. ``` ###### Creating backup of hosts file ... cp: missing destination file operand after '/etc/hosts /etc/hosts.220503-2314.bak' Try 'cp --help' for more information. ```
dw-0 commented 2022-05-05 10:14:01 +02:00 (Migrated from github.com)
Review
Copy Link

Thank you! Yes that was indeed a typo and i just fixed it.

Thank you! Yes that was indeed a typo and i just fixed it.
[[ $(dpkg-query -f'${Status}' --show lighttpd 2>/dev/null) = *\ installed ]] && \
clee commented 2022-05-04 07:21:48 +02:00 (Migrated from github.com)
Review
Copy Link
    sudo cp "/etc/hosts" "/etc/hosts.${current_date}.bak"
```suggestion sudo cp "/etc/hosts" "/etc/hosts.${current_date}.bak" ```
clee commented 2022-05-04 07:23:45 +02:00 (Migrated from github.com)
Review
Copy Link

I had to make this change in order to fix the error I got when I attempted to change the hostname (4/advanced, 7/change hostname from the menus) on armbian-22.05-trunk.

###### Creating backup of hosts file ...
cp: missing destination file operand after '/etc/hosts /etc/hosts.220503-2314.bak'
Try 'cp --help' for more information.
I had to make this change in order to fix the error I got when I attempted to change the hostname (4/advanced, 7/change hostname from the menus) on armbian-22.05-trunk. ``` ###### Creating backup of hosts file ... cp: missing destination file operand after '/etc/hosts /etc/hosts.220503-2314.bak' Try 'cp --help' for more information. ```
dw-0 commented 2022-05-05 10:14:01 +02:00 (Migrated from github.com)
Review
Copy Link

Thank you! Yes that was indeed a typo and i just fixed it.

Thank you! Yes that was indeed a typo and i just fixed it.
LIGHTTPD_FOUND="true"
clee commented 2022-05-04 07:21:48 +02:00 (Migrated from github.com)
Review
Copy Link
    sudo cp "/etc/hosts" "/etc/hosts.${current_date}.bak"
```suggestion sudo cp "/etc/hosts" "/etc/hosts.${current_date}.bak" ```
clee commented 2022-05-04 07:23:45 +02:00 (Migrated from github.com)
Review
Copy Link

I had to make this change in order to fix the error I got when I attempted to change the hostname (4/advanced, 7/change hostname from the menus) on armbian-22.05-trunk.

###### Creating backup of hosts file ...
cp: missing destination file operand after '/etc/hosts /etc/hosts.220503-2314.bak'
Try 'cp --help' for more information.
I had to make this change in order to fix the error I got when I attempted to change the hostname (4/advanced, 7/change hostname from the menus) on armbian-22.05-trunk. ``` ###### Creating backup of hosts file ... cp: missing destination file operand after '/etc/hosts /etc/hosts.220503-2314.bak' Try 'cp --help' for more information. ```
dw-0 commented 2022-05-05 10:14:01 +02:00 (Migrated from github.com)
Review
Copy Link

Thank you! Yes that was indeed a typo and i just fixed it.

Thank you! Yes that was indeed a typo and i just fixed it.
clee commented 2022-05-04 07:21:48 +02:00 (Migrated from github.com)
Review
Copy Link
    sudo cp "/etc/hosts" "/etc/hosts.${current_date}.bak"
```suggestion sudo cp "/etc/hosts" "/etc/hosts.${current_date}.bak" ```
clee commented 2022-05-04 07:23:45 +02:00 (Migrated from github.com)
Review
Copy Link

I had to make this change in order to fix the error I got when I attempted to change the hostname (4/advanced, 7/change hostname from the menus) on armbian-22.05-trunk.

###### Creating backup of hosts file ...
cp: missing destination file operand after '/etc/hosts /etc/hosts.220503-2314.bak'
Try 'cp --help' for more information.
I had to make this change in order to fix the error I got when I attempted to change the hostname (4/advanced, 7/change hostname from the menus) on armbian-22.05-trunk. ``` ###### Creating backup of hosts file ... cp: missing destination file operand after '/etc/hosts /etc/hosts.220503-2314.bak' Try 'cp --help' for more information. ```
dw-0 commented 2022-05-05 10:14:01 +02:00 (Migrated from github.com)
Review
Copy Link

Thank you! Yes that was indeed a typo and i just fixed it.

Thank you! Yes that was indeed a typo and i just fixed it.
### check system for an installed apache2 service
[[ $(dpkg-query -f'${Status}' --show apache2 2>/dev/null) = *\ installed ]] && \
APACHE2_FOUND="true"
clee commented 2022-05-04 07:21:48 +02:00 (Migrated from github.com)
Review
Copy Link
    sudo cp "/etc/hosts" "/etc/hosts.${current_date}.bak"
```suggestion sudo cp "/etc/hosts" "/etc/hosts.${current_date}.bak" ```
clee commented 2022-05-04 07:21:48 +02:00 (Migrated from github.com)
Review
Copy Link
    sudo cp "/etc/hosts" "/etc/hosts.${current_date}.bak"
```suggestion sudo cp "/etc/hosts" "/etc/hosts.${current_date}.bak" ```
clee commented 2022-05-04 07:23:45 +02:00 (Migrated from github.com)
Review
Copy Link

I had to make this change in order to fix the error I got when I attempted to change the hostname (4/advanced, 7/change hostname from the menus) on armbian-22.05-trunk.

###### Creating backup of hosts file ...
cp: missing destination file operand after '/etc/hosts /etc/hosts.220503-2314.bak'
Try 'cp --help' for more information.
I had to make this change in order to fix the error I got when I attempted to change the hostname (4/advanced, 7/change hostname from the menus) on armbian-22.05-trunk. ``` ###### Creating backup of hosts file ... cp: missing destination file operand after '/etc/hosts /etc/hosts.220503-2314.bak' Try 'cp --help' for more information. ```
clee commented 2022-05-04 07:23:45 +02:00 (Migrated from github.com)
Review
Copy Link

I had to make this change in order to fix the error I got when I attempted to change the hostname (4/advanced, 7/change hostname from the menus) on armbian-22.05-trunk.

###### Creating backup of hosts file ...
cp: missing destination file operand after '/etc/hosts /etc/hosts.220503-2314.bak'
Try 'cp --help' for more information.
I had to make this change in order to fix the error I got when I attempted to change the hostname (4/advanced, 7/change hostname from the menus) on armbian-22.05-trunk. ``` ###### Creating backup of hosts file ... cp: missing destination file operand after '/etc/hosts /etc/hosts.220503-2314.bak' Try 'cp --help' for more information. ```
dw-0 commented 2022-05-05 10:14:01 +02:00 (Migrated from github.com)
Review
Copy Link

Thank you! Yes that was indeed a typo and i just fixed it.

Thank you! Yes that was indeed a typo and i just fixed it.
dw-0 commented 2022-05-05 10:14:01 +02:00 (Migrated from github.com)
Review
Copy Link

Thank you! Yes that was indeed a typo and i just fixed it.

Thank you! Yes that was indeed a typo and i just fixed it.