From 1c848491b679c98908ae5a269da879e7bec4aee9 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sun, 30 Jan 2011 19:01:29 +0300 Subject: [PATCH] fix sanity_config script, regenerate check file --- sanity_config.php | 4 ++-- utils/regen_config_checks.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sanity_config.php b/sanity_config.php index 5dc2178a..67e373a6 100644 --- a/sanity_config.php +++ b/sanity_config.php @@ -1,3 +1,3 @@ - +$requred_defines = array( 'DB_TYPE', 'DB_HOST', 'DB_USER', 'DB_NAME', 'DB_PASS', 'MAGPIE_FETCH_TIME_OUT', 'MAGPIE_CACHE_DIR', 'MAGPIE_CACHE_AGE', 'ICONS_DIR', 'ICONS_URL', 'SINGLE_USER_MODE', 'TMP_DIRECTORY', 'ENABLE_UPDATE_DAEMON', 'DAEMON_SLEEP_INTERVAL', 'DATABASE_BACKED_SESSIONS', 'SESSION_CHECK_ADDRESS', 'SESSION_COOKIE_LIFETIME', 'SESSION_EXPIRE_TIME', 'DAEMON_UPDATE_LOGIN_LIMIT', 'CHECK_FOR_NEW_VERSION', 'USE_CURL', 'DIGEST_ENABLE', 'DIGEST_EMAIL_LIMIT', 'DAEMON_SENDS_DIGESTS', 'ENABLE_TRANSLATIONS', 'MYSQL_CHARSET', 'DEFAULT_UPDATE_METHOD', 'SIMPLEPIE_CACHE_DIR', 'SIMPLEPIE_CACHE_IMAGES', 'COUNTERS_MAX_AGE', 'DIGEST_FROM_NAME', 'DIGEST_FROM_ADDRESS', 'DIGEST_SUBJECT', 'DIGEST_SMTP_HOST', 'DIGEST_SMTP_LOGIN', 'DIGEST_SMTP_PASSWORD', 'DAEMON_FEED_LIMIT', 'ALLOW_REMOTE_USER_AUTH', 'AUTO_LOGIN', 'LOCK_DIRECTORY', 'ENABLE_GZIP_OUTPUT', 'PHP_EXECUTABLE', 'ENABLE_REGISTRATION', 'REG_NOTIFY_ADDRESS', 'REG_MAX_USERS', 'FEEDBACK_URL', 'FORCE_ARTICLE_PURGE', 'SPHINX_ENABLED', 'SPHINX_INDEX', 'ENABLE_TWEET_BUTTON', 'CONSUMER_KEY', 'CONSUMER_SECRET', 'CONFIG_VERSION'); ?> diff --git a/utils/regen_config_checks.sh b/utils/regen_config_checks.sh index 9e773785..8f753c82 100755 --- a/utils/regen_config_checks.sh +++ b/utils/regen_config_checks.sh @@ -10,7 +10,7 @@ echo ");" >> $DESTINATION echo -n "\$requred_defines = array( " >> $DESTINATION -grep define\( config.php-dist | awk -F\' '{ print "*" $2 "*," }' | xargs echo -n | grep -v DB_PORT | sed -e s/,$// -e s/*/\'/g >> $DESTINATION +grep define\( config.php-dist | awk -F\' '{ print "*" $2 "*," }' | grep -v DB_PORT | xargs echo -n | sed -e s/,$// -e s/*/\'/g >> $DESTINATION echo "); ?>" >> $DESTINATION