diff --git a/DEBIAN_COMPLIANCE b/DEBIAN_COMPLIANCE index d0b5c334..28684bfb 100644 --- a/DEBIAN_COMPLIANCE +++ b/DEBIAN_COMPLIANCE @@ -11,12 +11,6 @@ launching : in a debian server could help finding the right way to do it (eg: bind9 ) ;) Questions: - - what do we do about /var/alternc/exec.usr/ ? - -- we don't need our own php session folder don't we ? (or maybe for alternc-panel writable only ?) - W: alternc: non-standard-dir-perm var/alternc/sessions/ 1733 != 0755 - => /var/alternc/tmp => not easy to decide, cf #1458 - => we must check if alternc can work with memcached sessions (or force disks sessions) - some binaries / scripts don't have a man page @@ -52,6 +46,8 @@ Should be fixed, need more test: - /var/alternc/db => not used anymore, drop - /var/alternc/mla => not used anymore, drop - there is /var/alternc/cgi-bin/ is forgotten and now we use the standard /usr/lib/cgi-bin/ +- /var/alternc/exec.usr/ => usr/lib/alternc/safe_mode_exec_dir +- /var/alternc/sessions/ disapear for the standard PHP sessions dir. ******************************************************************************** FIXED: diff --git a/debian/alternc.dirs b/debian/alternc.dirs index fc4275fa..51b012ef 100644 --- a/debian/alternc.dirs +++ b/debian/alternc.dirs @@ -11,14 +11,13 @@ etc/phpmyadmin etc/postfix etc/sudoers.d usr/bin -usr/lib/alternc usr/share/alternc/panel +usr/lib/alternc usr/lib/alternc/install.d +usr/lib/alternc/safe_mode_exec_dir usr/sbin usr/share/alternc/install usr/share/locale/fr/LC_MESSAGES -var/alternc/exec.usr -var/alternc/tmp var/backups/alternc /var/lib/alternc/apache-vhost /var/lib/alternc/bind diff --git a/debian/rules b/debian/rules index b6019c99..20b14add 100755 --- a/debian/rules +++ b/debian/rules @@ -63,7 +63,7 @@ install: build chown -R 1999:1999 debian/alternc/usr/share/alternc/panel chmod -R 644 debian/alternc/usr/share/alternc/panel chmod -R a+X debian/alternc/usr/share/alternc/panel - chown -R www-data:www-data debian/alternc/var/log/alternc debian/alternc/var/alternc/tmp + chown -R www-data:www-data debian/alternc/var/log/alternc chmod a+x debian/alternc/usr/share/alternc/install/alternc.install debian/alternc/usr/share/alternc/install/dopo.sh debian/alternc/usr/share/alternc/install/mysql.sh debian/alternc/usr/share/alternc/install/newone.php debian/alternc/usr/share/alternc/install/reset_root.php debian/alternc/usr/share/alternc/install/upgrade_check.sh debian/alternc/usr/share/alternc/install/upgrades/*.php debian/alternc/usr/share/alternc/install/upgrades/*.sh mkdir -p debian/alternc/var/run/alternc/ diff --git a/etc/alternc/templates/alternc/apache2.conf b/etc/alternc/templates/alternc/apache2.conf index ab2b3b63..11b8adeb 100644 --- a/etc/alternc/templates/alternc/apache2.conf +++ b/etc/alternc/templates/alternc/apache2.conf @@ -1,3 +1,8 @@ +# AUTO GENERATED FILE +# Modify template in /etc/alternc/templates/ +# and launch alternc.install if you want +# to modify this file. +# # This module is loaded in /etc/apache/modules, and enabled by apache-modconf # LoadModule vhost_alias_module /usr/lib/apache/1.3/mod_vhost_alias.so @@ -30,7 +35,7 @@ ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/ php_admin_flag safe_mode off AddDefaultCharset UTF-8 # open_basedir allows access to specifics directories. We need to grant access to these directories for alternc, awstats, mailman... - php_admin_value open_basedir /usr/share/alternc-mailman/patches/:/etc/alternc/:/var/run/alternc/:/usr/share/alternc/panel/:%%ALTERNC_HTML%%/:/var/alternc/tmp:/tmp:/usr/share/php/:/var/cache/alternc-webalizer/:/etc/locale.gen:%%ALTERNC_LOGS%%/:/etc/awstats/ + php_admin_value open_basedir /usr/share/alternc-mailman/patches/:/etc/alternc/:/var/run/alternc/:/usr/share/alternc/panel/:%%ALTERNC_HTML%%/:/tmp:/usr/share/php/:/var/cache/alternc-webalizer/:/etc/locale.gen:%%ALTERNC_LOGS%%/:/etc/awstats/ @@ -42,13 +47,17 @@ ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/ Allow from all php_admin_flag safe_mode_gid off php_admin_flag safe_mode off - php_admin_value disable_functions chmod,chown,chgrp,link,symlink - php_admin_value safe_mode_exec_dir /var/alternc/exec.usr - php_admin_value disable_functions chgrp,link,symlink - php_admin_flag enable_dl off - php_admin_value upload_tmp_dir /var/alternc/tmp + + php_admin_value disable_functions chmod,chown,chgrp,link,symlink + php_admin_value safe_mode_exec_dir /usr/lib/alternc/safe_mode_exec_dir + php_admin_value disable_functions chgrp,link,symlink php_admin_value sendmail_path /usr/lib/alternc/sendmail + + # Default upload_tmp_dir is /tmp . Be carefull, this value MUST be surcharged + # by the vhost to be a directory INSIDE the home of the user. If you don't do + # that, ACLs could be "strange" or inexistent. + php_admin_value upload_tmp_dir /tmp diff --git a/etc/alternc/templates/alternc/apache_logformat.conf b/etc/alternc/templates/alternc/apache_logformat.conf index 718a6676..1fd79a87 100644 --- a/etc/alternc/templates/alternc/apache_logformat.conf +++ b/etc/alternc/templates/alternc/apache_logformat.conf @@ -1,3 +1,9 @@ +# AUTO GENERATED FILE +# Modify template in /etc/alternc/templates/ +# and launch alternc.install if you want +# to modify this file. +# + LogFormat "%{LOGIN}e %h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %T %{Host}i" alternc CustomLog "|| /usr/sbin/vlogger -u alterncpanel -g alterncpanel -s access.log -t \"access-%Y%m%d.log\" %%ALTERNC_LOGS%%" alternc diff --git a/etc/alternc/templates/apache2/envvars b/etc/alternc/templates/apache2/envvars index d54b5586..e52236c1 100644 --- a/etc/alternc/templates/apache2/envvars +++ b/etc/alternc/templates/apache2/envvars @@ -1,3 +1,8 @@ +# AUTO GENERATED FILE +# Modify template in /etc/alternc/templates/ +# and launch alternc.install if you want +# to modify this file. +# # envvars - default environment variables for apache2ctl # this won't be correct after changing uid diff --git a/etc/alternc/templates/dovecot/dovecot-dict-quota.conf b/etc/alternc/templates/dovecot/dovecot-dict-quota.conf index ddc159e2..2832f501 100644 --- a/etc/alternc/templates/dovecot/dovecot-dict-quota.conf +++ b/etc/alternc/templates/dovecot/dovecot-dict-quota.conf @@ -1,3 +1,8 @@ +# AUTO GENERATED FILE +# Modify template in /etc/alternc/templates/ +# and launch alternc.install if you want +# to modify this file. +# connect=host=%%dbhost%% dbname=%%dbname%% user=%%db_mail_user%% password=%%db_mail_pwd%% #connect = host=localhost dbname=mails user=testuser password=pass diff --git a/etc/alternc/templates/dovecot/dovecot-sql.conf b/etc/alternc/templates/dovecot/dovecot-sql.conf index 9d2e379e..232980a8 100644 --- a/etc/alternc/templates/dovecot/dovecot-sql.conf +++ b/etc/alternc/templates/dovecot/dovecot-sql.conf @@ -1,3 +1,9 @@ +# AUTO GENERATED FILE +# Modify template in /etc/alternc/templates/ +# and launch alternc.install if you want +# to modify this file. +# + # This file is opened as root, so it should be owned by root and mode 0600. # # http://wiki.dovecot.org/AuthDatabase/SQL diff --git a/etc/alternc/templates/dovecot/dovecot.conf b/etc/alternc/templates/dovecot/dovecot.conf index be756235..9782a0c8 100644 --- a/etc/alternc/templates/dovecot/dovecot.conf +++ b/etc/alternc/templates/dovecot/dovecot.conf @@ -1,3 +1,8 @@ +# AUTO GENERATED FILE +# Modify template in /etc/alternc/templates/ +# and launch alternc.install if you want +# to modify this file. +# ## Dovecot configuration file # If you're in a hurry, see http://wiki.dovecot.org/QuickConfiguration diff --git a/etc/alternc/templates/incron.d/alternc b/etc/alternc/templates/incron.d/alternc index 9ad1ca93..5bcc08ab 100644 --- a/etc/alternc/templates/incron.d/alternc +++ b/etc/alternc/templates/incron.d/alternc @@ -1,2 +1,4 @@ +# WARNING: Do not edit this file, edit the one in /etc/alternc/templates and launch alternc.install again. + /var/run/alternc/ IN_CREATE,IN_ATTRIB,IN_NO_LOOP /usr/lib/alternc/inotify_update_domains.sh diff --git a/etc/alternc/templates/postfix/master.cf b/etc/alternc/templates/postfix/master.cf index 904494ed..c140795b 100644 --- a/etc/alternc/templates/postfix/master.cf +++ b/etc/alternc/templates/postfix/master.cf @@ -1,3 +1,8 @@ +# AUTO GENERATED FILE +# Modify template in /etc/alternc/templates/ +# and launch alternc.install if you want +# to modify this file. +# # # Postfix master process configuration file. For details on the format # of the file, see the master(5) manual page (command: "man 5 master").