Skip to content

Commit 85c5716

Browse files
jamesottingerjamesottinger
committed
fix naming issues in debian installation files
1 parent 47c8534 commit 85c5716

File tree

3 files changed

+25
-25
lines changed

3 files changed

+25
-25
lines changed

‎debian/linode-longview.config‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -42,30 +42,30 @@ apache_status_path() {
4242
if [ ! -z $apache_url ]; then
4343
if _check_apache_url $apache_url ; then
4444
echoerr "Found Apache status page at $apache_url specified in $apache_config_filename"
45-
db_set Longivew/apache-location ""
45+
db_set Longview/apache-location ""
4646
return 0
4747
elif [ "$apache_url" = "$apache_default_url" ]; then
4848
echoerr "Attempt to access $apache_url specified in $apache_config_filename failed..."
4949
else
5050
echoerr "Attempt to access $apache_url specified in $apache_config_filename failed...trying default"
5151
if _check_apache_url $apache_default_url; then
5252
echoerr "Found Apache status page at $apache_default_url (default URL)"
53-
db_set Longivew/apache-location "$apache_default_url"
53+
db_set Longview/apache-location "$apache_default_url"
5454
return 0;
5555
elif _check_apache_url $apache_default_https; then
5656
echoerr "Found Apache status page at $apache_default_https"
57-
db_set Longivew/apache-location "$apache_default_https"
57+
db_set Longview/apache-location "$apache_default_https"
5858
return 0;
5959
fi
6060
fi
6161
else
6262
if _check_apache_url $apache_default_url; then
6363
echoerr "Found Apache status page at $apache_default_url (default URL)"
64-
db_set Longivew/apache-location "$apache_default_url"
64+
db_set Longview/apache-location "$apache_default_url"
6565
return 0;
6666
elif _check_apache_url $apache_default_https; then
6767
echoerr "Found Apache status page at $apache_default_https"
68-
db_set Longivew/apache-location "$apache_default_https"
68+
db_set Longview/apache-location "$apache_default_https"
6969
return 0;
7070
fi
7171
fi
@@ -75,12 +75,12 @@ apache_status_path() {
7575
if [ ! -z $guess_url ]; then
7676
if _check_apache_url http://127.0.0.1$guess_url?auto; then
7777
echoerr "Found Apache status page at http://127.0.0.1$guess_url?auto"
78-
db_set Longivew/apache-location "http://127.0.0.1$guess_url?auto"
78+
db_set Longview/apache-location "http://127.0.0.1$guess_url?auto"
7979
return 0
8080
fi
8181
fi
8282

83-
db_set Longivew/apache-location "$apache_default_url"
83+
db_set Longview/apache-location "$apache_default_url"
8484
db_fset Longview/apache-try-configure seen "false"
8585
db_input high Longview/apache-try-configure
8686
}
@@ -97,57 +97,57 @@ nginx_status_path(){
9797
if [ ! -z $nginx_url ]; then
9898
if _check_nginx_url $nginx_url; then
9999
echoerr "Found nginx status page at $nginx_url specified in $nginx_config_filename"
100-
db_set Longivew/nginx-location ""
100+
db_set Longview/nginx-location ""
101101
return 0
102102
elif [ "$nginx_url" = "$nginx_default_url" ]; then
103103
echoerr "Attempt to access $nginx_url specified in $nginx_config_filename failed..."
104104
else
105105
echoerr "Attempt to access $nginx_url specified in $nginx_config_filename failed...trying default"
106106
if _check_nginx_url $nginx_default_url; then
107107
echoerr "Found nginx status page at $nginx_default_url (default URL)"
108-
db_set Longivew/nginx-location ""
108+
db_set Longview/nginx-location ""
109109
return 0;
110110
elif _check_nginx_url $nginx_default_https; then
111111
echoerr "Found nginx status page at $nginx_default_https"
112-
db_set Longivew/nginx-location "$nginx_default_https"
112+
db_set Longview/nginx-location "$nginx_default_https"
113113
return 0;
114114
fi
115115
fi
116116
fi
117117

118118
if _check_nginx_url $nginx_default_url; then
119119
echoerr "Found nginx status page at $nginx_default_url (default URL)"
120-
db_set Longivew/nginx-location ""
120+
db_set Longview/nginx-location ""
121121
return 0;
122122
elif _check_nginx_url $nginx_default_https; then
123123
echoerr "Found nginx status page at $nginx_default_https"
124-
db_set Longivew/nginx-location "$nginx_default_https"
124+
db_set Longview/nginx-location "$nginx_default_https"
125125
return 0;
126126
fi
127127

128128
# don't be smart unless we know where to work
129129
if [ ! -d /etc/nginx/sites-enabled ]; then
130130
echoerr "Unable to automatically configure nginx for Longview. Please see https://library.linode.com/longview/longview-for-nginx#sph_manual-configuration-all-distributions"
131-
db_set Longivew/nginx-location ""
131+
db_set Longview/nginx-location ""
132132
return 0
133133
fi
134134

135135
# this is kind of weird
136136
# check to make sure that the haxor mode is gonna work
137137
if grep -ri '^[[:space:]]*server_name.*127\.0\.0\.2' /etc/nginx/sites-enabled; then
138138
echoerr "Unable to automatically configure nginx for Longview. Please see https://library.linode.com/longview/longview-for-nginx#sph_manual-configuration-all-distributions"
139-
db_set Longivew/nginx-location ""
139+
db_set Longview/nginx-location ""
140140
return 0
141141
fi
142142

143143
if [ -e /etc/nginx/sites-available/longview ]; then
144144
if _check_nginx_url http://127.0.0.2/nginx_status; then
145145
echoerr "Found location configured by Longview previously."
146-
db_set Longivew/nginx-location "http://127.0.0.2/nginx_status"
146+
db_set Longview/nginx-location "http://127.0.0.2/nginx_status"
147147
return 0
148148
fi
149149
echoerr "Unable to automatically configure nginx for Longview. Please see https://library.linode.com/longview/longview-for-nginx#sph_manual-configuration-all-distributions"
150-
db_set Longivew/nginx-location ""
150+
db_set Longview/nginx-location ""
151151
return 0
152152
fi
153153
db_input high Longview/nginx-try-configure || true
@@ -163,7 +163,7 @@ mysql_cred_check() {
163163
if [ ! -z $mysql_username ] && [ ! -z $mysql_password ]; then
164164
if _mysql_check_install $mysql_username $mysql_password; then
165165
echoerr "Successfully connected to MySQL with the credentials located in $mysql_config_filename"
166-
db_set Longivew/mysql-password ""
166+
db_set Longview/mysql-password ""
167167
return 0
168168
else
169169
echoerr "Unable to connect using the credentials specified in $mysql_config_filename...trying Debian maintenance user"
@@ -174,7 +174,7 @@ mysql_cred_check() {
174174
mysql_password=$(egrep '^\s*password\s*=\s*' /etc/mysql/debian.cnf | head -n1 | sed 's/^\s*password\s*=\s*//')
175175
if _mysql_check_install debian-sys-maint $mysql_password; then
176176
echoerr "Successfully connected to MySQL"
177-
db_set Longivew/mysql-password ""
177+
db_set Longview/mysql-password ""
178178
if [ ! -z $mysql_username ] && [ ! -z $mysql_password ]; then
179179
db_subst Longview/mysql-overwrite-creds found_user "$mysql_username"
180180
db_input high Longview/mysql-overwrite-creds || true
@@ -188,7 +188,7 @@ mysql_cred_check() {
188188

189189
create_statement="CREATE USER 'linode-longview'@'localhost' IDENTIFIED BY '$mysql_password';"
190190

191-
db_set Longivew/mysql-password "$mysql_password"
191+
db_set Longview/mysql-password "$mysql_password"
192192
db_subst Longview/mysql-create-creds create_statement "$create_statement"
193193
db_input high Longview/mysql-create-creds || true
194194
}

‎debian/linode-longview.postinst‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ _write_option(){
4040
apache_install() {
4141
apache_config_filename=${longview_config_dir}Apache.conf
4242

43-
db_get Longivew/apache-location
43+
db_get Longview/apache-location
4444
location="$RET"
4545

4646
if [ ! -z "$location" ]; then
@@ -103,7 +103,7 @@ END
103103
nginx_install() {
104104
nginx_config_filename=${longview_config_dir}Nginx.conf
105105

106-
db_get Longivew/nginx-location
106+
db_get Longview/nginx-location
107107
location="$RET"
108108

109109
if [ ! -z "$location" ]; then
@@ -166,7 +166,7 @@ mysql_install() {
166166
if [ ! -z "$pass" ]; then
167167
_write_option $mysql_config_filename username "linode-longview"
168168
_write_option $mysql_config_filename password "$pass"
169-
db_set Longivew/mysql-password ""
169+
db_set Longview/mysql-password ""
170170
return 0
171171
fi
172172
}

‎debian/linode-longview.templates‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Default:
44
Description: Please enter your Longview API Key:
55
Please enter your Longview API Key.
66

7-
Template: Longivew/apache-location
7+
Template: Longview/apache-location
88
Type: string
99
Default:
1010
Description: Mod_Status URL:
@@ -18,7 +18,7 @@ Description: Autoconfigure Mod_Status:
1818
the server status page. Would you like to attempt to automatically configure
1919
mod_status? This will require reloading Apache to enable.
2020

21-
Template: Longivew/nginx-location
21+
Template: Longview/nginx-location
2222
Type: string
2323
Default:
2424
Description: Nginx Status URL:
@@ -51,7 +51,7 @@ Description: Overwrite existing Longview MySQL config:
5151
'debian-sys-maint' user was found, would you like to configure longview to
5252
use those credentials instead?
5353

54-
Template: Longivew/mysql-password
54+
Template: Longview/mysql-password
5555
Type: string
5656
Default:
5757
Description: Longview Mysql user password:

0 commit comments

Comments
 (0)