Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
freedombone
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Context Sensitive Group
freedombone
Commits
62964309
Commit
62964309
authored
6 years ago
by
Bob Mottram
Browse files
Options
Downloads
Patches
Plain Diff
Allow new default domain to be set from webadmin
parent
369cc3fe
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/freedombone-installer
+27
-0
27 additions, 0 deletions
src/freedombone-installer
with
27 additions
and
0 deletions
src/freedombone-installer
+
27
−
0
View file @
62964309
...
...
@@ -75,6 +75,7 @@ MUTED_WORDS=/root/${PROJECT_NAME}-firewall-words.cfg
local_hostname=$(grep 'host-name' /etc/avahi/avahi-daemon.conf | awk -F '=' '{print $2}').local
webadmin_install_dir="/var/www/${local_hostname}/htdocs/admin"
default_domain_file="$webadmin_install_dir/.default_domain.txt"
scuttlebot_file="$webadmin_install_dir/.scuttlebot_invite.txt"
email_proxy_file="$webadmin_install_dir/.emailproxy.txt"
theme_file="$webadmin_install_dir/.theme.txt"
...
...
@@ -2980,6 +2981,31 @@ function import_translations {
fi
}
function
change_default_domain
{
if
[
-f
"$
default_domain_file
"
];
then
new_default_domain_name=
$(cat
"$
default_domain_file
")
rm
"$
default_domain_file
"
if
[
"$
new_default_domain_name
"
];
then
if
[
${
#new_default_domain_name
}
-gt
5
];
then
if
[[
"$
new_default_domain_name
"
==
*
'.'
*
]];
then
#
set
the
new
default
domain
within
the
config
file
if
!
grep
-q
"
NEW_DEFAULT_DOMAIN_NAME=
" $CONFIGURATION_FILE; then
echo "
NEW_DEFAULT_DOMAIN_NAME=
$new_default_domain_name"
>
> $CONFIGURATION_FILE
else
sed -i "s|NEW_DEFAULT_DOMAIN_NAME=.*|NEW_DEFAULT_DOMAIN_NAME=$new_default_domain_name|g" $CONFIGURATION_FILE
fi
# initiate an upgrade
touch "$upgrade_file"
fi
fi
fi
fi
}
function create_scuttlebot_invite {
if [ -f "$scuttlebot_file" ]; then
if [ -d /etc/scuttlebot ]; then
...
...
@@ -3479,6 +3505,7 @@ do
webadmin_upgrade
create_scuttlebot_invite
install_apps_from_webadmin
change_default_domain
sleep 1
remove_apps_from_webadmin
fi
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment