kienan
/
AlternC
mirror of https://github.com/kienanstewart/AlternC.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Templatizing apache envvars file to use AlternC environement variable in sendmail script.

This commit is contained in:
Steven Mondji-Lerider 2013-02-19 14:10:39 +00:00
parent 42307ffc2b
commit e3b0ad0c95
4 changed files with 40 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitattributes vendored
View File

@ -461,6 +461,7 @@ etc/alternc/templates/alternc/apache_logformat.conf -text
etc/alternc/templates/alternc/bureau.conf -text
etc/alternc/templates/alternc/postfix/postfix-slave.cf -text
etc/alternc/templates/alternc/postfix/postfix.cf -text
etc/alternc/templates/apache2/envvars -text
etc/alternc/templates/apache2/panel.conf -text
etc/alternc/templates/apache2/url.conf -text
etc/alternc/templates/apache2/vhost.conf -text

36
etc/alternc/templates/apache2/envvars Normal file
View File

@ -0,0 +1,36 @@
# envvars - default environment variables for apache2ctl
# this won't be correct after changing uid
unset HOME
# for supporting multiple apache2 instances
if [ "${APACHE_CONFDIR##/etc/apache2-}" != "${APACHE_CONFDIR}" ] ; then
SUFFIX="-${APACHE_CONFDIR##/etc/apache2-}"
else
SUFFIX=
fi
# Since there is no sane way to get the parsed apache2 config in scripts, some
# settings are defined via environment variables and then used in apache2ctl,
# /etc/init.d/apache2, /etc/logrotate.d/apache2, etc.
export APACHE_RUN_USER=www-data
export APACHE_RUN_GROUP=www-data
export APACHE_PID_FILE=/var/run/apache2$SUFFIX.pid
export APACHE_RUN_DIR=/var/run/apache2$SUFFIX
export APACHE_LOCK_DIR=/var/lock/apache2$SUFFIX
# Only /var/log/apache2 is handled by /etc/logrotate.d/apache2.
export APACHE_LOG_DIR=/var/log/apache2$SUFFIX
## The locale used by some modules like mod_dav
export LANG=C
## Uncomment the following line to use the system default locale instead:
#. /etc/default/locale
export LANG
## The command to get the status for 'apache2ctl status'.
## Some packages providing 'www-browser' need '--dump' instead of '-dump'.
#export APACHE_LYNX='www-browser -dump'
export ALTERNC_HTML=%%ALTERNC_HTML%%
export ALTERNC_LOGS=%%ALTERNC_LOGS%%
export ALTERNC_MAIL=%%ALTERNC_MAIL%%

2
install/alternc.install
View File

@ -64,7 +64,7 @@ TEMPLATE_DIR="/etc/alternc/templates"
# Find needed configuration files (without the initial '/')
# replace this one unconditionnally
CONFIG_FILES="etc/alternc/bureau.conf etc/incron.d/alternc etc/alternc/apache2.conf etc/alternc/apache_logformat.conf"
CONFIG_FILES="etc/alternc/bureau.conf etc/incron.d/alternc etc/alternc/envvars etc/alternc/apache2.conf etc/alternc/apache_logformat.conf"
if [ -e /etc/bind/named.conf ]; then
CONFIG_FILES="$CONFIG_FILES etc/bind/templates/zone.template

3
src/sendmail
View File

@ -20,7 +20,8 @@ while ($A ne "") {
chomp($A=<STDIN>);
}
$ENV{'PWD'}=~/^\/var\/alternc\/html\/.\/([^\/]*)/;
$home=quotemeta $ENV{'ALTERNC_HTML'};
$ENV{'PWD'}=~/^$home\/.\/([^\/]*)/;
$user=$1;
if (!$fr) {