diff --git a/centos/SPECS/httpd.spec b/centos/SPECS/httpd.spec index 36cf7d0..f81edc7 100644 --- a/centos/SPECS/httpd.spec +++ b/centos/SPECS/httpd.spec @@ -8,7 +8,7 @@ Summary: Apache HTTP Server Name: httpd Version: 2.4.29 -Release: 2%{?dist} +Release: 1%{?dist} URL: http://httpd.apache.org/ Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2 Source1: index.html @@ -44,7 +44,6 @@ Source30: README.confd Source31: README.confmod Source40: htcacheclean.service Source41: htcacheclean.sysconf -Source42: status-info.conf # build/scripts patches Patch1: httpd-2.4.1-apctl.patch Patch2: httpd-2.4.9-apxs.patch @@ -299,7 +298,6 @@ done mkdir $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d \ $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.modules.d \ $RPM_BUILD_ROOT%{_sysconfdir}/httpd/vhosts.d -install -m 644 %{S:42} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/status-info.conf install -m 644 %{S:29} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/00-vhosts.conf install -m 644 $RPM_SOURCE_DIR/README.confd \ $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/README @@ -687,9 +685,6 @@ rm -rf $RPM_BUILD_ROOT %{_rpmconfigdir}/macros.d/macros.httpd %changelog -* Wed Mar 14 2018 Daniel Steiner - 2.4.29-2 -- status-info.conf added. - * Tue Feb 13 2018 Daniel Steiner - 2.4.29-1 - new version 2.4.29 diff --git a/centos/SPECS/sftp-config.json b/centos/SPECS/sftp-config.json new file mode 100644 index 0000000..b6777d9 --- /dev/null +++ b/centos/SPECS/sftp-config.json @@ -0,0 +1,45 @@ +{ + // The tab key will cycle through the settings when first created + // Visit http://wbond.net/sublime_packages/sftp/settings for help + + // sftp, ftp or ftps + "type": "sftp", + + "save_before_upload": true, + "upload_on_save": false, + "sync_down_on_open": false, + "sync_skip_deletes": false, + "sync_same_age": true, + "confirm_downloads": false, + "confirm_sync": true, + "confirm_overwrite_newer": false, + + "host": "cent7build", + "user": "root", + //"password": "password", + //"port": "22", + + "remote_path": "/root/rpmbuild/SPECS/", + "ignore_regexes": [ + "\\.sublime-(project|workspace)", "sftp-config(-alt\\d?)?\\.json", + "sftp-settings\\.json", "/venv/", "\\.svn/", "\\.hg/", "\\.git/", + "\\.bzr", "_darcs", "CVS", "\\.DS_Store", "Thumbs\\.db", "desktop\\.ini" + ], + //"file_permissions": "664", + //"dir_permissions": "775", + + //"extra_list_connections": 0, + + "connect_timeout": 30, + //"keepalive": 120, + //"ftp_passive_mode": true, + //"ftp_obey_passive_host": false, + //"ssh_key_file": "~/.ssh/id_rsa", + //"sftp_flags": ["-F", "/path/to/ssh_config"], + + //"preserve_modification_times": false, + //"remote_time_offset_in_hours": 0, + //"remote_encoding": "utf-8", + //"remote_locale": "C", + //"allow_config_upload": false, +}