diff --git a/codepot/README b/codepot/README index 0020c826..654f8e66 100644 --- a/codepot/README +++ b/codepot/README @@ -15,6 +15,7 @@ INSTALLATION $ sudo apt-get install subversion $ sudo apt-get install apache2-mpm-prefork $ sudo apt-get install libapache2-svn + $ sudo apt-get install libapache2-mod-auth-mysql # optional $ sudo apt-get install php5 php5-ldap php5-mysql $ sudo apt-get install php5-svn # if available @@ -27,7 +28,8 @@ INSTALLATION * Enable the apache server modules $ sudo a2enmod php5 - $ sudo a2enmod authnz_ldap + $ sudo a2enmod authnz_ldap # enable ldap-based authentication + $ sudo a2enmod auth_mysql # enable mysql-based authentication $ sudo a2enmod dav_svn $ sudo a2enmod userdir # to enable $HOME/public_html $ sudo /etc/init.d/apache2 restart @@ -48,7 +50,7 @@ INSTALLATION * Initialize database using CFGDIR/codepot.sql * Configure apache web server ahthentication for subversion webdav access - using CFGDIR/codepot.a2ldap + using CFGDIR/codepot.a2ldap or CFGDIR/codepot.a2mysql * To enable SSL $ sudo a2enmod ssl diff --git a/codepot/configure b/codepot/configure index 779b8094..93bb247c 100755 --- a/codepot/configure +++ b/codepot/configure @@ -2969,7 +2969,7 @@ cachedir=$cachedir -ac_config_files="$ac_config_files Makefile etc/Makefile etc/codepot.ini etc/codepot.a2ldap DEBIAN/Makefile DEBIAN/control DEBIAN/postinst DEBIAN/postrm src/config.php src/codepot/config/Makefile src/codepot/controllers/Makefile src/codepot/errors/Makefile src/codepot/helpers/Makefile src/codepot/hooks/Makefile src/codepot/language/english/Makefile src/codepot/language/indonesian/Makefile src/codepot/language/korean/Makefile src/codepot/language/Makefile src/codepot/libraries/Makefile src/codepot/models/Makefile src/codepot/views/Makefile src/codepot/Makefile src/css/images/Makefile src/css/Makefile src/js/prettify/Makefile src/js/Makefile src/system/cache/Makefile src/system/codeigniter/Makefile src/system/database/drivers/mssql/Makefile src/system/database/drivers/mysql/Makefile src/system/database/drivers/mysqli/Makefile src/system/database/drivers/oci8/Makefile src/system/database/drivers/odbc/Makefile src/system/database/drivers/postgre/Makefile src/system/database/drivers/sqlite/Makefile src/system/database/drivers/Makefile src/system/database/Makefile src/system/fonts/Makefile src/system/helpers/Makefile src/system/language/english/Makefile src/system/language/Makefile src/system/libraries/Makefile src/system/logs/Makefile src/system/plugins/Makefile src/system/scaffolding/images/Makefile src/system/scaffolding/views/Makefile src/system/scaffolding/Makefile src/system/Makefile src/websvn/cache/Makefile src/websvn/doc/Makefile src/websvn/include/Makefile src/websvn/languages/Makefile src/websvn/lib/geshi/Makefile src/websvn/lib/Makefile src/websvn/temp/Makefile src/websvn/templates/calm/images/Makefile src/websvn/templates/calm/star-light/smilies/Makefile src/websvn/templates/calm/star-light/src/Makefile src/websvn/templates/calm/star-light/Makefile src/websvn/templates/calm/Makefile src/websvn/templates/Makefile src/websvn/Makefile src/Makefile" +ac_config_files="$ac_config_files Makefile etc/Makefile etc/codepot.ini etc/codepot.a2ldap DEBIAN/Makefile DEBIAN/control DEBIAN/postinst DEBIAN/postrm src/config.php src/codepot/config/Makefile src/codepot/controllers/Makefile src/codepot/errors/Makefile src/codepot/helpers/Makefile src/codepot/hooks/Makefile src/codepot/language/english/Makefile src/codepot/language/indonesian/Makefile src/codepot/language/korean/Makefile src/codepot/language/Makefile src/codepot/libraries/Makefile src/codepot/models/Makefile src/codepot/views/Makefile src/codepot/Makefile src/css/images/Makefile src/css/Makefile src/js/prettify/Makefile src/js/Makefile src/system/cache/Makefile src/system/codeigniter/Makefile src/system/database/drivers/mssql/Makefile src/system/database/drivers/mysql/Makefile src/system/database/drivers/mysqli/Makefile src/system/database/drivers/oci8/Makefile src/system/database/drivers/odbc/Makefile src/system/database/drivers/postgre/Makefile src/system/database/drivers/sqlite/Makefile src/system/database/drivers/Makefile src/system/database/Makefile src/system/fonts/Makefile src/system/helpers/Makefile src/system/language/english/Makefile src/system/language/korean/Makefile src/system/language/Makefile src/system/libraries/Makefile src/system/logs/Makefile src/system/plugins/Makefile src/system/scaffolding/images/Makefile src/system/scaffolding/views/Makefile src/system/scaffolding/Makefile src/system/Makefile src/websvn/cache/Makefile src/websvn/doc/Makefile src/websvn/include/Makefile src/websvn/languages/Makefile src/websvn/lib/geshi/Makefile src/websvn/lib/Makefile src/websvn/temp/Makefile src/websvn/templates/calm/images/Makefile src/websvn/templates/calm/star-light/smilies/Makefile src/websvn/templates/calm/star-light/src/Makefile src/websvn/templates/calm/star-light/Makefile src/websvn/templates/calm/Makefile src/websvn/templates/Makefile src/websvn/Makefile src/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -3695,6 +3695,7 @@ do "src/system/fonts/Makefile") CONFIG_FILES="$CONFIG_FILES src/system/fonts/Makefile" ;; "src/system/helpers/Makefile") CONFIG_FILES="$CONFIG_FILES src/system/helpers/Makefile" ;; "src/system/language/english/Makefile") CONFIG_FILES="$CONFIG_FILES src/system/language/english/Makefile" ;; + "src/system/language/korean/Makefile") CONFIG_FILES="$CONFIG_FILES src/system/language/korean/Makefile" ;; "src/system/language/Makefile") CONFIG_FILES="$CONFIG_FILES src/system/language/Makefile" ;; "src/system/libraries/Makefile") CONFIG_FILES="$CONFIG_FILES src/system/libraries/Makefile" ;; "src/system/logs/Makefile") CONFIG_FILES="$CONFIG_FILES src/system/logs/Makefile" ;; diff --git a/codepot/configure.ac b/codepot/configure.ac index 467815b3..21a32bff 100644 --- a/codepot/configure.ac +++ b/codepot/configure.ac @@ -118,6 +118,7 @@ AC_CONFIG_FILES([ src/system/fonts/Makefile src/system/helpers/Makefile src/system/language/english/Makefile + src/system/language/korean/Makefile src/system/language/Makefile src/system/libraries/Makefile src/system/logs/Makefile diff --git a/codepot/etc/codepot.a2ldap.in b/codepot/etc/codepot.a2ldap.in index b3e4a610..b1f0a9ee 100644 --- a/codepot/etc/codepot.a2ldap.in +++ b/codepot/etc/codepot.a2ldap.in @@ -26,18 +26,20 @@ AuthBasicProvider ldap # prevent other authenticatication moudles from authenticating users - # if this one fails. + # if this one fails. Set it to 'off' for 'require valid-user' as it + # is handled by mod_authz_user. AuthzLDAPAuthoritative on AuthLDAPGroupAttribute memberUid AuthLDAPGroupAttributeIsDN off AuthLDAPRemoteUserIsDN off + # ldap binding information AuthLDAPURL ldap://127.0.0.1:389/ou=users,dc=sample,dc=net?uid AuthLDAPBindDN cn=admin,dc=sample,dc=net AuthLDAPBindPassword xxxxxxx - Require ldap-group cn=developers,ou=groups,dc=sample,dc=net + Require ldap-group cn=users,ou=groups,dc=sample,dc=net # # Apache version 2.0.41 diff --git a/codepot/etc/codepot.ini.in b/codepot/etc/codepot.ini.in index 78599f7c..81d8ace0 100644 --- a/codepot/etc/codepot.ini.in +++ b/codepot/etc/codepot.ini.in @@ -104,3 +104,14 @@ svnrepo_dir = "@DEPOTDIR@/svnrepo" ; directory to store uploaded files ;------------------------------------------------------------------------------ file_dir = "@DEPOTDIR@/files" + +;------------------------------------------------------------------------------ +; log threshold +;------------------------------------------------------------------------------ +; 0 = Disables logging, Error logging TURNED OFF +; 1 = Error Messages (including PHP errors) +; 2 = Debug Messages +; 3 = Informational Messages +; 4 = All Messages +;------------------------------------------------------------------------------ +log_threshold = 0 diff --git a/codepot/src/codepot/config/config.php b/codepot/src/codepot/config/config.php index 5d66aa6b..0e786568 100644 --- a/codepot/src/codepot/config/config.php +++ b/codepot/src/codepot/config/config.php @@ -176,7 +176,7 @@ $config['directory_trigger'] = 'd'; // experimental not currently in use | your log files will fill up very fast. | */ -$config['log_threshold'] = 0; +$config['log_threshold'] = CODEPOT_LOG_THRESHOLD; /* |-------------------------------------------------------------------------- @@ -234,12 +234,12 @@ $config['encryption_key'] = ""; | 'time_to_update' = how many seconds between CI refreshing Session Information | */ -$config['sess_cookie_name'] = 'ci_session'; -$config['sess_expiration'] = 7200; -$config['sess_encrypt_cookie'] = FALSE; -$config['sess_use_database'] = FALSE; -$config['sess_table_name'] = 'ci_sessions'; -$config['sess_match_ip'] = FALSE; +$config['sess_cookie_name'] = 'codepot_session'; +$config['sess_expiration'] = 72000; +$config['sess_encrypt_cookie'] = FALSE; +$config['sess_use_database'] = FALSE; +$config['sess_table_name'] = 'codepot_sessions'; +$config['sess_match_ip'] = FALSE; $config['sess_match_useragent'] = TRUE; $config['sess_time_to_update'] = 300; diff --git a/codepot/src/codepot/config/lang_detect.php b/codepot/src/codepot/config/lang_detect.php index 24f508e7..a324dba1 100644 --- a/codepot/src/codepot/config/lang_detect.php +++ b/codepot/src/codepot/config/lang_detect.php @@ -27,7 +27,7 @@ $config['lang_selected'] = 'en'; // 'lang_expiration' = the number of SECONDS you want the language to be // remembered. by default 2 years. // Set zero for expiration when the browser is closed. -$config['lang_cookie_name'] = 'lang_select_language'; +$config['lang_cookie_name'] = 'codepot_select_language'; $config['lang_expiration'] = 63072000; ?> diff --git a/codepot/src/codepot/libraries/Lang_detect.php b/codepot/src/codepot/libraries/Lang_detect.php index b91cc559..92fcaeb0 100644 --- a/codepot/src/codepot/libraries/Lang_detect.php +++ b/codepot/src/codepot/libraries/Lang_detect.php @@ -187,10 +187,8 @@ class Lang_detect //log_message('debug', __CLASS__.".detectLanguage(): Use default language: $lang ($language)"); } -/* // set the configuration for the CI_Language class $this->obj->config->set_item('language', $language); -*/ // store the language code too $this->obj->config->set_item('lang_selected', $lang); diff --git a/codepot/src/config.php.in b/codepot/src/config.php.in index 9d991b30..7b812b3f 100644 --- a/codepot/src/config.php.in +++ b/codepot/src/config.php.in @@ -1,11 +1,11 @@ +
+Directory access is forbidden.
+ + +