diff --git a/createlinks b/createlinks index 8f7306b..ee3c5ef 100644 --- a/createlinks +++ b/createlinks @@ -3,7 +3,7 @@ use esmith::Build::CreateLinks qw(:all); # Templates to expand -templates2events("/etc/e-smith/sql/init/opensondage", qw(bootstrap-console-save webapps-update)); +templates2events("/etc/e-smith/sql/init/limesurvey", qw(bootstrap-console-save webapps-update)); templates2events("/usr/share/limesurvey/application/config/config.php", qw(bootstrap-console-save webapps-update)); safe_symlink("/etc/e-smith/templates-default/template-begin-php", "root/etc/e-smith/templates/usr/share/limesurvey/application/config/config.php/template-begin"); diff --git a/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98LimeSurvey b/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98LimeSurvey index d09b134..8bd636b 100644 --- a/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98LimeSurvey +++ b/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98LimeSurvey @@ -3,9 +3,7 @@ my $access = $limesurvey{'access'} || 'private'; my $allow = ($access eq 'public')?'all':"$localAccess $externalSSLAccess"; my $alias = (($limesurvey{'AliasOnPrimary'} || 'enabled') ne 'enabled') ? - '':"Alias /limesurvey/tmp /var/lib/limesurvey/tmp\n" . - "Alias /limesurvey/upload /var/lib/limesurvey/upload\n" . - "Alias /limesurvey /usr/share/limesurvey"; + '':'Alias /limesurvey /usr/share/limesurvey'; my $auth = (($limesurvey{'Authentication'} || 'http') eq 'http') ? "AuthName \"LimeSurvey\"\n" . " AuthType Basic\n" . " AuthExternal pwauth\n" . diff --git a/root/etc/e-smith/templates/usr/share/limesurvey/application/config/config.php/20Conf b/root/etc/e-smith/templates/usr/share/limesurvey/application/config/config.php/20Conf index bff5057..7cfe666 100644 --- a/root/etc/e-smith/templates/usr/share/limesurvey/application/config/config.php/20Conf +++ b/root/etc/e-smith/templates/usr/share/limesurvey/application/config/config.php/20Conf @@ -13,8 +13,8 @@ return array( 'db' => array( 'connectionString' => 'mysql:unix_socket=/var/lib/mysql/mysql.sock;dbname={$limesurevey{'DbName'} || 'limesurvey'};', 'emulatePrepare' => true, - 'username' => '{$limesurevey{'DbUser'} || 'limesurvey'}', - 'password' => '{$limesurevey{'DbPassword'} || 'limesurvey'}', + 'username' => '{$limesurvey{'DbUser'} || 'limesurvey'}', + 'password' => '{$limesurvey{'DbPassword'} || 'limesurvey'}', 'charset' => 'utf8', 'tablePrefix' => '', ),