From 493453ee59aa79791d31a08ec80ad3de373043e1 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Fri, 22 Nov 2013 23:24:54 -0500 Subject: [PATCH] Remove conf folder (to be replaced with chef) --- conf/nginx/mime.types | 79 --------- conf/nginx/nginx.conf | 71 -------- conf/nginx/php.conf | 22 --- conf/php/php-fpm.conf | 76 --------- conf/php/php.ini | 375 ------------------------------------------ 5 files changed, 623 deletions(-) delete mode 100644 conf/nginx/mime.types delete mode 100644 conf/nginx/nginx.conf delete mode 100644 conf/nginx/php.conf delete mode 100644 conf/php/php-fpm.conf delete mode 100644 conf/php/php.ini diff --git a/conf/nginx/mime.types b/conf/nginx/mime.types deleted file mode 100644 index 5d132eb2..00000000 --- a/conf/nginx/mime.types +++ /dev/null @@ -1,79 +0,0 @@ -types { - text/html html htm shtml; - text/css css; - text/xml xml; - image/gif gif; - image/jpeg jpeg jpg; - application/x-javascript js; - application/atom+xml atom; - application/rss+xml rss; - - text/mathml mml; - text/plain txt; - text/vnd.sun.j2me.app-descriptor jad; - text/vnd.wap.wml wml; - text/x-component htc; - - image/png png; - image/tiff tif tiff; - image/vnd.wap.wbmp wbmp; - image/x-icon ico; - image/x-jng jng; - image/x-ms-bmp bmp; - image/svg+xml svg svgz; - image/webp webp; - - application/java-archive jar war ear; - application/mac-binhex40 hqx; - application/msword doc; - application/pdf pdf; - application/postscript ps eps ai; - application/rtf rtf; - application/vnd.ms-excel xls; - application/vnd.ms-powerpoint ppt; - application/vnd.wap.wmlc wmlc; - application/vnd.google-earth.kml+xml kml; - application/vnd.google-earth.kmz kmz; - application/x-7z-compressed 7z; - application/x-cocoa cco; - application/x-java-archive-diff jardiff; - application/x-java-jnlp-file jnlp; - application/x-makeself run; - application/x-perl pl pm; - application/x-pilot prc pdb; - application/x-rar-compressed rar; - application/x-redhat-package-manager rpm; - application/x-sea sea; - application/x-shockwave-flash swf; - application/x-stuffit sit; - application/x-tcl tcl tk; - application/x-x509-ca-cert der pem crt; - application/x-xpinstall xpi; - application/xhtml+xml xhtml; - application/zip zip; - - application/octet-stream bin exe dll; - application/octet-stream deb; - application/octet-stream dmg; - application/octet-stream eot; - application/octet-stream iso img; - application/octet-stream msi msp msm; - - audio/midi mid midi kar; - audio/mpeg mp3; - audio/ogg ogg; - audio/x-m4a m4a; - audio/x-realaudio ra; - - video/3gpp 3gpp 3gp; - video/mp4 mp4; - video/mpeg mpeg mpg; - video/quicktime mov; - video/webm webm; - video/x-flv flv; - video/x-m4v m4v; - video/x-mng mng; - video/x-ms-asf asx asf; - video/x-ms-wmv wmv; - video/x-msvideo avi; -} diff --git a/conf/nginx/nginx.conf b/conf/nginx/nginx.conf deleted file mode 100644 index 3d7124e0..00000000 --- a/conf/nginx/nginx.conf +++ /dev/null @@ -1,71 +0,0 @@ -user hlissner staff; -worker_processes 1; -pid /usr/local/var/run/nginx.pid; - -error_log /usr/local/var/log/nginx-error.log; - -events { - worker_connections 1024; -} - -http { - - include mime.types; - default_type application/octet-stream; - - #log_format main '$remote_addr - $remote_user [$time_local] "$request" ' - # '$status $body_bytes_sent "$http_referer" ' - # '"$http_user_agent" "$http_x_forwarded_for"'; - - #access_log logs/access.log main; - - sendfile on; - tcp_nopush on; - tcp_nodelay off; - - #keepalive_timeout 0; - keepalive_timeout 25; - - gzip on; - expires off; - - # Proxy settings - proxy_redirect off; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_max_temp_file_size 0; - - proxy_connect_timeout 90; - proxy_send_timeout 90; - proxy_read_timeout 90; - - proxy_buffer_size 4k; - proxy_buffers 4 32k; - proxy_busy_buffers_size 64k; - proxy_temp_file_write_size 64k; - - server { - listen 80; - server_name localhost dev; - root /usr/local/www/public; - - index index.html index.php; - - #charset koi8-r; - #access_log logs/host.access.log main; - - # redirect server error pages - #error_page 404 /404.html; - error_page 500 502 503 504 /50x.html; - - try_files $uri/ /$uri.html /index.php?$args; - - location ~ \.php$ { - include php.conf; - } - } - - include /usr/local/etc/nginx/sites/*.conf; - -} diff --git a/conf/nginx/php.conf b/conf/nginx/php.conf deleted file mode 100644 index 9ab5ef76..00000000 --- a/conf/nginx/php.conf +++ /dev/null @@ -1,22 +0,0 @@ -fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; -fastcgi_param QUERY_STRING $query_string; -fastcgi_param REQUEST_METHOD $request_method; -fastcgi_param CONTENT_TYPE $content_type; -fastcgi_param CONTENT_LENGTH $content_length; -fastcgi_param SCRIPT_NAME $fastcgi_script_name; -fastcgi_param REQUEST_URI $request_uri; -fastcgi_param DOCUMENT_URI $document_uri; -fastcgi_param DOCUMENT_ROOT $document_root; -fastcgi_param SERVER_PROTOCOL $server_protocol; -fastcgi_param HTTPS $https if_not_empty; -fastcgi_param GATEWAY_INTERFACE CGI/1.1; -fastcgi_param SERVER_SOFTWARE nginx/$nginx_version; -fastcgi_param REMOTE_ADDR $remote_addr; -fastcgi_param REMOTE_PORT $remote_port; -fastcgi_param SERVER_ADDR $server_addr; -fastcgi_param SERVER_PORT $server_port; -fastcgi_param SERVER_NAME $server_name; - -fastcgi_pass unix:/usr/local/var/run/php-fpm.sock; -fastcgi_index index.php; -fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; diff --git a/conf/php/php-fpm.conf b/conf/php/php-fpm.conf deleted file mode 100644 index 90d3cf00..00000000 --- a/conf/php/php-fpm.conf +++ /dev/null @@ -1,76 +0,0 @@ -;;;;;;;;;;;;;;;;;;;;; -; FPM Configuration ; -;;;;;;;;;;;;;;;;;;;;; - -;include=/usr/local/etc/php/5.4/fpm.d/*.conf - - -;;;;;;;;;;;;;;;;;; -; Global Options ; -;;;;;;;;;;;;;;;;;; - -[global] -daemonize = yes -pid = run/php-fpm.pid -error_log = log/php-fpm.log -;syslog.facility = daemon -;syslog.ident = php-fpm -;log_level = notice -;emergency_restart_threshold = 0 -;emergency_restart_interval = 0 -;process_control_timeout = 0 -;rlimit_files = 1024 -;rlimit_core = 0 - - -;;;;;;;;;;;;;;;;;;;; -; Pool Definitions ; -;;;;;;;;;;;;;;;;;;;; - -[www] -;prefix = /path/to/pools/$pool - -;user = hlissner -;group = staff - -listen = /usr/local/var/run/php-fpm.sock -;listen.backlog = 128 -;listen.owner = _www -;listen.group = _www -;listen.mode = 0666 -;listen.allowed_clients = 127.0.0.1 - -pm = dynamic -pm.max_children = 10 -pm.start_servers = 3 -pm.min_spare_servers = 2 -pm.max_spare_servers = 5 -;pm.process_idle_timeout = 10s; -;pm.max_requests = 500 -;pm.status_path = /status - -;ping.path = /ping -;ping.response = pong -;access.log = log/$pool.access.log -;access.format = "%R - %u %t \"%m %r%Q%q\" %s %f %{mili}d %{kilo}M %C%%" -;slowlog = log/$pool.log.slow -;request_slowlog_timeout = 0 -;request_terminate_timeout = 0 -;rlimit_files = 1024 -;rlimit_core = 0 -;chroot = -;chdir = /var/www -;catch_workers_output = yes -;security.limit_extensions = .php .php3 .php4 .php5 - -;env[HOSTNAME] = $HOSTNAME -;env[PATH] = /usr/local/bin:/usr/bin:/bin -;env[TMP] = /tmp -;env[TMPDIR] = /tmp -;env[TEMP] = /tmp - -;php_admin_value[sendmail_path] = /usr/sbin/sendmail -t -i -f www@my.domain.com -;php_flag[display_errors] = off -;php_admin_value[error_log] = /var/log/fpm-php.www.log -;php_admin_flag[log_errors] = on -;php_admin_value[memory_limit] = 32M diff --git a/conf/php/php.ini b/conf/php/php.ini deleted file mode 100644 index 34eec3f5..00000000 --- a/conf/php/php.ini +++ /dev/null @@ -1,375 +0,0 @@ -[PHP] - -;;;;;;;;;;;;;;;;;;;; -;user_ini.filename = ".user.ini" -;user_ini.filename = -;user_ini.cache_ttl = 300 - -;;;;;;;;;;;;;;;;;;;; -engine = On -short_open_tag = Off -asp_tags = Off -precision = 14 -output_buffering = 4096 -;output_handler = -zlib.output_compression = Off -;zlib.output_compression_level = -1 -;zlib.output_handler = -implicit_flush = Off -unserialize_callback_func = -serialize_precision = 17 -;open_basedir = -disable_functions = -disable_classes = -;highlight.string = #DD0000 -;highlight.comment = #FF9900 -;highlight.keyword = #007700 -;highlight.default = #0000BB -;highlight.html = #000000 -;ignore_user_abort = On -;realpath_cache_size = 16k -;realpath_cache_ttl = 120 -zend.enable_gc = On -;zend.multibyte = Off -;zend.script_encoding = - -;;;;;;;;;;;;;;;;; -expose_php = On - -;;;;;;;;;;;;;;;;;;; -max_execution_time = 30 -max_input_time = 60 -;max_input_nesting_level = 64 -memory_limit = 128M - -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -error_reporting = E_ALL -display_errors = On -display_startup_errors = On -log_errors = On -log_errors_max_len = 1024 -ignore_repeated_errors = Off -ignore_repeated_source = Off -report_memleaks = On -;report_zend_debug = 0 -track_errors = On -;xmlrpc_errors = 0 -;xmlrpc_error_number = 0 -html_errors = On -;docref_root = "/phpmanual/" -;docref_ext = .html -;error_prepend_string = "" -;error_append_string = "" -;error_log = php_errors.log -;error_log = syslog -;windows.show_crt_warning - -;;;;;;;;;;;;;;;;; -;arg_separator.output = "&" -;arg_separator.input = ";&" -variables_order = "GPCS" -request_order = "GP" -register_argc_argv = Off -auto_globals_jit = On -;enable_post_data_reading = Off -post_max_size = 8M -auto_prepend_file = -auto_append_file = -; -default_mimetype = "text/html" -;default_charset = "UTF-8" -;always_populate_raw_post_data = On - -;;;;;;;;;;;;;;;;;;;;;;;;; -;include_path = ".:/php/includes" -;include_path = ".;c:\php\includes" - -doc_root = -user_dir = -enable_dl = Off -;cgi.force_redirect = 1 -;cgi.nph = 1 -;cgi.redirect_status_env = -;cgi.fix_pathinfo=1 -;fastcgi.impersonate = 1 -;fastcgi.logging = 0 -;cgi.rfc2616_headers = 0 - -;;;;;;;;;;;;;;;; -file_uploads = On -;upload_tmp_dir = -upload_max_filesize = 2M -max_file_uploads = 20 - -;;;;;;;;;;;;;;;;;; -allow_url_fopen = On -allow_url_include = Off -;from="john@doe.com" -;user_agent="PHP" -default_socket_timeout = 60 -;auto_detect_line_endings = Off - -;;;;;;;;;;;;;;;;;;; - - -;;;;;;;;;;;;;;;;;;; - -[CLI Server] -cli_server.color = On - -[Date] -date.timezone = "America/Toronto" -;date.default_latitude = 31.7667 -;date.default_longitude = 35.2333 -;date.sunrise_zenith = 90.583333 -;date.sunset_zenith = 90.583333 - -[filter] -;filter.default = unsafe_raw -;filter.default_flags = - -[iconv] -;iconv.input_encoding = ISO-8859-1 -;iconv.internal_encoding = ISO-8859-1 -;iconv.output_encoding = ISO-8859-1 - -[intl] -;intl.default_locale = -;intl.error_level = E_WARNING - -[sqlite] -;sqlite.assoc_case = 0 - -[sqlite3] -;sqlite3.extension_dir = - -[Pdo] -;pdo_odbc.connection_pooling=strict -;pdo_odbc.db2_instance_name - -[Pdo_mysql] -pdo_mysql.cache_size = 2000 -pdo_mysql.default_socket= - -[Phar] -;phar.readonly = On -;phar.require_hash = On -;phar.cache_list = - -[mail function] -SMTP = localhost -smtp_port = 25 -;sendmail_from = me@example.com -;sendmail_path = -;mail.force_extra_parameters = -mail.add_x_header = On -;mail.log = -;mail.log = syslog - -[SQL] -sql.safe_mode = Off - -[ODBC] -odbc.allow_persistent = On -odbc.check_persistent = On -odbc.max_persistent = -1 -odbc.max_links = -1 -odbc.defaultlrl = 4096 -odbc.defaultbinmode = 1 -;birdstep.max_links = -1 - -[Interbase] -ibase.allow_persistent = 1 -ibase.max_persistent = -1 -ibase.max_links = -1 -;ibase.default_db = -;ibase.default_user = -;ibase.default_password = -;ibase.default_charset = -ibase.timestampformat = "%Y-%m-%d %H:%M:%S" -ibase.dateformat = "%Y-%m-%d" -ibase.timeformat = "%H:%M:%S" - -[MySQL] -mysql.allow_local_infile = On -mysql.allow_persistent = On -mysql.cache_size = 2000 -mysql.max_persistent = -1 -mysql.max_links = -1 -mysql.default_port = -mysql.default_socket = -mysql.default_host = -mysql.default_user = -mysql.default_password = -mysql.connect_timeout = 60 -mysql.trace_mode = Off - -[MySQLi] -mysqli.max_persistent = -1 -;mysqli.allow_local_infile = On -mysqli.allow_persistent = On -mysqli.max_links = -1 -mysqli.cache_size = 2000 -mysqli.default_port = 3306 -mysqli.default_socket = -mysqli.default_host = -mysqli.default_user = -mysqli.default_pw = -mysqli.reconnect = Off - -[mysqlnd] -mysqlnd.collect_statistics = On -mysqlnd.collect_memory_statistics = On -;mysqlnd.net_cmd_buffer_size = 2048 -;mysqlnd.net_read_buffer_size = 32768 - -[OCI8] -;oci8.privileged_connect = Off -;oci8.max_persistent = -1 -;oci8.persistent_timeout = -1 -;oci8.ping_interval = 60 -;oci8.connection_class = -;oci8.events = Off -;oci8.statement_cache_size = 20 -;oci8.default_prefetch = 100 -;oci8.old_oci_close_semantics = Off - -[PostgreSQL] -pgsql.allow_persistent = On -pgsql.auto_reset_persistent = Off -pgsql.max_persistent = -1 -pgsql.max_links = -1 -pgsql.ignore_notice = 0 -pgsql.log_notice = 0 - -[Sybase-CT] -sybct.allow_persistent = On -sybct.max_persistent = -1 -sybct.max_links = -1 -sybct.min_server_severity = 10 -sybct.min_client_severity = 10 -;sybct.timeout= -;sybct.packet_size -;sybct.login_timeout= -;sybct.hostname= -;sybct.deadlock_retry_count= - -[bcmath] -bcmath.scale = 0 - -[browscap] -;browscap = extra/browscap.ini - -[Session] -session.save_handler = files -;session.save_path = "/tmp" -session.use_cookies = 1 -;session.cookie_secure = -session.use_only_cookies = 1 -session.name = PHPSESSID -session.auto_start = 0 -session.cookie_lifetime = 0 -session.cookie_path = / -session.cookie_domain = -session.cookie_httponly = -session.serialize_handler = php -session.gc_probability = 1 -session.gc_divisor = 1000 -session.gc_maxlifetime = 1440 -session.bug_compat_42 = On -session.bug_compat_warn = On -session.referer_check = -;session.entropy_length = 32 -;session.entropy_file = /dev/urandom -session.cache_limiter = nocache -session.cache_expire = 180 -session.use_trans_sid = 0 -session.hash_function = 0 -session.hash_bits_per_character = 5 -url_rewriter.tags = "a=href,area=href,frame=src,input=src,form=fakeentry" -;session.upload_progress.enabled = On -;session.upload_progress.cleanup = On -;session.upload_progress.prefix = "upload_progress_" -;session.upload_progress.name = "PHP_SESSION_UPLOAD_PROGRESS" -;session.upload_progress.freq = "1%" -;session.upload_progress.min_freq = "1" - -[MSSQL] -mssql.allow_persistent = On -mssql.max_persistent = -1 -mssql.max_links = -1 -mssql.min_error_severity = 10 -mssql.min_message_severity = 10 -mssql.compatability_mode = Off -;mssql.connect_timeout = 5 -;mssql.timeout = 60 -;mssql.textlimit = 4096 -;mssql.textsize = 4096 -;mssql.batchsize = 0 -;mssql.datetimeconvert = On -mssql.secure_connection = Off -;mssql.max_procs = -1 -;mssql.charset = "ISO-8859-1" - -[Assertion] -;assert.active = On -;assert.warning = On -;assert.bail = Off -;assert.callback = 0 -;assert.quiet_eval = 0 - -[COM] -;com.typelib_file = -;com.allow_dcom = true -;com.autoregister_typelib = true -;com.autoregister_casesensitive = false -;com.autoregister_verbose = true -;com.code_page= - -[mbstring] -;mbstring.language = Japanese -;mbstring.internal_encoding = EUC-JP -;mbstring.http_input = auto -;mbstring.http_output = SJIS -;mbstring.encoding_translation = Off -;mbstring.detect_order = auto -;mbstring.substitute_character = none; -;mbstring.func_overload = 0 -;mbstring.strict_detection = Off -;mbstring.http_output_conv_mimetype= - -[gd] -;gd.jpeg_ignore_warning = 0 - -[exif] -;exif.encode_unicode = ISO-8859-15 -;exif.decode_unicode_motorola = UCS-2BE -;exif.decode_unicode_intel = UCS-2LE -;exif.encode_jis = -;exif.decode_jis_motorola = JIS -;exif.decode_jis_intel = JIS - -[Tidy] -;tidy.default_config = /usr/local/lib/php/default.tcfg - -tidy.clean_output = Off - -[soap] -soap.wsdl_cache_enabled=1 -soap.wsdl_cache_dir="/tmp" -soap.wsdl_cache_ttl=86400 -soap.wsdl_cache_limit = 5 - -[sysvshm] -;sysvshm.init_mem = 10000 - -[ldap] -ldap.max_links = -1 - -[mcrypt] -;mcrypt.algorithms_dir= -;mcrypt.modes_dir= - -[dba] -;dba.default_handler= -