Skip to content

Commit 6a8d0d8

Browse files
tbrehmtbrehm
committed
improved opensuse install instructions and fixed template problems.
1 parent e0efb21 commit 6a8d0d8

File tree

7 files changed

+74
-54
lines changed

7 files changed

+74
-54
lines changed

‎docs/INSTALL_OPENSUSE_11_1.txt‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,9 @@ chkconfig --add courier-imap-ssl
4343

4444
cd /tmp
4545

46-
wget http://download.opensuse.org/repositories/server:/php:/applications/openSUSE_11.1/src/phpMyAdmin-3.1.2-1.1.src.rpm
47-
rpm -i phpMyAdmin-3.1.2-1.1.src.rpm
46+
yast2 -i pwgen
47+
rpm -i http://download.opensuse.org/repositories/server:/php:/applications/openSUSE_11.1/noarch/phpMyAdmin-3.1.2-1.1.noarch.rpm
48+
ln -s /srv/www/htdocs/phpMyAdmin /usr/local/ispconfig/interface/web/phpmyadmin
4849

4950
// Warnings like "warning: phpMyAdmin-3.1.2-1.1.src.rpm: Header V3 DSA signature: NOKEY, key ID 367fe7fc" can be ignored.
5051

@@ -67,15 +68,10 @@ make install
6768
rm -rf pam_mysql-0.7RC1
6869
rm pam_mysql-0.7RC1.tar.gz
6970

71+
7072
// Set the mysql database password:
7173

7274
mysqladmin -u root password yourrootsqlpassword
73-
mysqladmin -h ispconfig.local -u root password yourrootsqlpassword
74-
75-
76-
// Install phpmyadmin
77-
yast2 -i pwgen
78-
rpm -i http://download.opensuse.org/repositories/server:/php:/applications/openSUSE_11.1/noarch/phpMyAdmin-3.1.2-1.1.noarch.rpm
7975

8076

8177
2) Install Amavisd-new, Spamassassin and Clamav (1 line!):
@@ -185,6 +181,9 @@ Now start the installation process by executing:
185181

186182
php -q install.php
187183

184+
// Cleanup
185+
rm -rf /tmp/trunk
186+
188187
The installer will configure all services like postfix, sasl, courier, etc. for you. A manual setup as required for ISPConfig 2 (perfect setup guides) is not nescessary. To login to the ISPConfig controlpanel, open the following URL in your browser (replace the IP to match your settings!):
189188

190189
http://192.168.0.100:8080/

‎interface/web/mail/mail_domain_edit.php‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,9 +113,10 @@ function onShowEnd() {
113113

114114
if($this->id > 0) {
115115
//* we are editing a existing record
116-
$app->tpl->setVar("edit_disabled", 'disabled="disabled"');
116+
$app->tpl->setVar("edit_disabled", 1);
117+
$app->tpl->setVar("server_id_value", $this->dataRecord["server_id"]);
117118
} else {
118-
$app->tpl->setVar("edit_disabled", '');
119+
$app->tpl->setVar("edit_disabled", 0);
119120
}
120121

121122
parent::onShowEnd();

‎interface/web/mail/templates/mail_domain_edit.htm‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,18 @@ <h2><tmpl_var name="list_head_txt"></h2>
77
<fieldset class="inlineLabels">
88
<tmpl_if name="is_admin">
99
<div class="ctrlHolder">
10-
<label for="server_id">{tmpl_var name='server_id_txt'}</label>
11-
<select name="server_id" id="server_id" class="selectInput" {tmpl_var name='edit_disabled'}>
12-
{tmpl_var name='server_id'}
13-
</select>
10+
<tmpl_if name="edit_disabled">
11+
<label for="server_id_disabled">{tmpl_var name='server_id_txt'}</label>
12+
<select name="server_id_disabled" id="server_id_disabled" class="selectInput" disabled="disabled">
13+
{tmpl_var name='server_id'}
14+
</select>
15+
<input type="hidden" name="server_id" value="{tmpl_var name='server_id_value'}" />
16+
<tmpl_else>
17+
<label for="server_id">{tmpl_var name='server_id_txt'}</label>
18+
<select name="server_id" id="server_id" class="selectInput">
19+
{tmpl_var name='server_id'}
20+
</select>
21+
</tmpl_if>
1422
</div>
1523
<div class="ctrlHolder">
1624
<label for="client_group_id">{tmpl_var name='client_txt'}</label>

‎interface/web/sites/database_edit.php‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,9 +176,11 @@ function onShowEnd() {
176176

177177
if($this->id > 0) {
178178
//* we are editing a existing record
179-
$app->tpl->setVar("edit_disabled", 'disabled="disabled"');
179+
$app->tpl->setVar("edit_disabled", 1);
180+
$app->tpl->setVar("server_id_value", $this->dataRecord["server_id"]);
181+
$app->tpl->setVar("database_charset_value", $this->dataRecord["database_charset"]);
180182
} else {
181-
$app->tpl->setVar("edit_disabled", '');
183+
$app->tpl->setVar("edit_disabled", 0);
182184
}
183185

184186
parent::onShowEnd();

‎interface/web/sites/templates/database_edit.htm‎

Lines changed: 34 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,37 +7,50 @@ <h2><tmpl_var name="list_head_txt"></h2>
77
<fieldset class="inlineLabels">
88
<tmpl_if name="is_admin">
99
<div class="ctrlHolder">
10-
<label for="server_id">{tmpl_var name='server_id_txt'}</label>
11-
<select name="server_id" id="server_id" class="selectInput" {tmpl_var name='edit_disabled'}>
12-
{tmpl_var name='server_id'}
13-
</select>
10+
<tmpl_if name="edit_disabled">
11+
<label for="server_id_disabled">{tmpl_var name='server_id_txt'}</label>
12+
<select name="server_id_disabled" id="server_id_disabled" class="selectInput" disabled="disabled">
13+
{tmpl_var name='server_id'}
14+
</select>
15+
<input type="hidden" name="server_id" value="{tmpl_var name='server_id_value'}" />
16+
<tmpl_else>
17+
<label for="server_id">{tmpl_var name='server_id_txt'}</label>
18+
<select name="server_id" id="server_id" class="selectInput" onChange="loadContentInto('ip_address','sites/ajax_get_ip.php?server_id='+document.getElementById('server_id').value)">
19+
{tmpl_var name='server_id'}
20+
</select>
21+
</tmpl_if>
1422
</div>
1523
<div class="ctrlHolder">
1624
<label for="client_group_id">{tmpl_var name='client_txt'}</label>
1725
<select name="client_group_id" id="client_group_id" class="selectInput">
1826
{tmpl_var name='client_group_id'}
19-
</select>
27+
</select>
2028
</div>
2129
</tmpl_if>
2230
<tmpl_if name="is_reseller">
2331
<div class="ctrlHolder">
2432
<label for="client_group_id">{tmpl_var name='client_txt'}</label>
2533
<select name="client_group_id" id="client_group_id" class="selectInput">
2634
{tmpl_var name='client_group_id'}
27-
</select>
35+
</select>
2836
</div>
2937
</tmpl_if>
3038
<div class="ctrlHolder">
3139
<label for="type">{tmpl_var name='type_txt'}</label>
3240
<select name="type" id="type" class="selectInput formLengthHalf">
3341
{tmpl_var name='type'}
34-
</select>
42+
</select>
3543
</div>
3644
<div class="ctrlHolder">
3745
<label for="database_name">{tmpl_var name='database_name_txt'}</label>
3846
<div style="float: left;">{tmpl_var name='database_name_prefix'} </div>
39-
<input name="database_name" id="database_name" value="{tmpl_var name='database_name'}" size="30" maxlength="255" type="text" class="textInput formLengthHalf" {tmpl_var name='edit_disabled'} />
40-
</div>
47+
<tmpl_if name="edit_disabled">
48+
<input name="database_name" id="database_name" value="{tmpl_var name='database_name'}" size="30" maxlength="255" type="text" class="textInput formLengthHalf" disabled="disabled" />
49+
<input name="database_name" type="hidden" value="{tmpl_var name='database_name'}" />
50+
<tmpl_else>
51+
<input name="database_name" id="database_name" value="{tmpl_var name='database_name'}" size="30" maxlength="255" type="text" class="textInput formLengthHalf" />
52+
</tmpl_if>
53+
</div>
4154
<div class="ctrlHolder">
4255
<label for="database_user">{tmpl_var name='database_user_txt'}</label>
4356
<div style="float: left;">{tmpl_var name='database_user_prefix'} </div>
@@ -53,10 +66,18 @@ <h2><tmpl_var name="list_head_txt"></h2>
5366
<p class="formHint"><span id="passText">&nbsp;</span></p>
5467
</div>
5568
<div class="ctrlHolder">
56-
<label for="database_charset">{tmpl_var name='database_charset_txt'}</label>
57-
<select name="database_charset" id="database_charset" class="selectInput formLengthHalf" {tmpl_var name='edit_disabled'}>
58-
{tmpl_var name='database_charset'}
59-
</select>
69+
<tmpl_if name="edit_disabled">
70+
<label for="database_charset_disabled">{tmpl_var name='database_charset_txt'}</label>
71+
<select name="database_charset_disabled" id="database_charset_disabled" class="selectInput formLengthHalf" disabled="disabled">
72+
{tmpl_var name='database_charset'}
73+
</select>
74+
<input type="hidden" name="database_charset" value="{tmpl_var name='database_charset_value'}" />
75+
<tmpl_else>
76+
<label for="database_charset">{tmpl_var name='database_charset_txt'}</label>
77+
<select name="database_charset" id="database_charset" class="selectInput formLengthHalf">
78+
{tmpl_var name='database_charset'}
79+
</select>
80+
</tmpl_if>
6081
</div>
6182
<div class="ctrlHolder">
6283
<p class="label">{tmpl_var name='remote_access_txt'}</p>

‎interface/web/sites/templates/web_domain_edit.htm‎

Lines changed: 11 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,18 @@ <h2><tmpl_var name="list_head_txt"></h2>
77
<fieldset class="inlineLabels">
88
<tmpl_if name="is_admin">
99
<div class="ctrlHolder">
10-
<label for="server_id">{tmpl_var name='server_id_txt'}</label>
10+
<tmpl_if name="edit_disabled">
11+
<label for="server_id_disabled">{tmpl_var name='server_id_txt'}</label>
12+
<select name="server_id_disabled" id="server_id_disabled" class="selectInput" disabled="disabled">
13+
{tmpl_var name='server_id'}
14+
</select>
15+
<input type="hidden" name="server_id" value="{tmpl_var name='server_id_value'}" />
16+
<tmpl_else>
17+
<label for="server_id">{tmpl_var name='server_id_txt'}</label>
1118
<select name="server_id" id="server_id" class="selectInput" onChange="loadContentInto('ip_address','sites/ajax_get_ip.php?server_id='+document.getElementById('server_id').value)">
12-
{tmpl_var name='server_id'}
13-
</select>
19+
{tmpl_var name='server_id'}
20+
</select>
21+
</tmpl_if>
1422
</div>
1523
<div class="ctrlHolder">
1624
<label for="client_group_id">{tmpl_var name='client_group_id_txt'}</label>
@@ -37,26 +45,6 @@ <h2><tmpl_var name="list_head_txt"></h2>
3745
<label for="domain">{tmpl_var name='domain_txt'}</label>
3846
<input name="domain" id="domain" value="{tmpl_var name='domain'}" size="30" maxlength="255" type="text" class="textInput" />
3947
</div>
40-
<!--
41-
<div class="ctrlHolder">
42-
<label for="type">{tmpl_var name='type_txt'}</label>
43-
<select name="type" id="type" class="selectInput">
44-
{tmpl_var name='type'}
45-
</select>
46-
</div>
47-
<div class="ctrlHolder">
48-
<label for="parent_domain_id">{tmpl_var name='parent_domain_id_txt'}</label>
49-
<select name="parent_domain_id" id="parent_domain_id" class="selectInput">
50-
{tmpl_var name='parent_domain_id'}
51-
</select>
52-
</div>
53-
<div class="ctrlHolder">
54-
<label for="vhost_type">{tmpl_var name='vhost_type_txt'}</label>
55-
<select name="vhost_type" id="vhost_type" class="selectInput">
56-
{tmpl_var name='vhost_type'}
57-
</select>
58-
</div>
59-
-->
6048
<div class="ctrlHolder">
6149
<label for="hd_quota">{tmpl_var name='hd_quota_txt'}</label>
6250
<input name="hd_quota" id="hd_quota" value="{tmpl_var name='hd_quota'}" size="7" maxlength="7" type="text" class="textInput formLengthLimit" />

‎interface/web/sites/web_domain_edit.php‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -187,9 +187,10 @@ function onShowEnd() {
187187

188188
if($this->id > 0) {
189189
//* we are editing a existing record
190-
$app->tpl->setVar("edit_disabled", 'disabled="disabled"');
190+
$app->tpl->setVar("edit_disabled", 1);
191+
$app->tpl->setVar("server_id_value", $this->dataRecord["server_id"]);
191192
} else {
192-
$app->tpl->setVar("edit_disabled", '');
193+
$app->tpl->setVar("edit_disabled", 0);
193194
}
194195

195196
parent::onShowEnd();

0 commit comments

Comments
 (0)