This is an automated email from the ASF dual-hosted git repository.
rubys pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git
The following commit(s) were added to refs/heads/master by this push:
new 2efb6e2 add collate minutes
2efb6e2 is described below
commit 2efb6e24294b8ef96544da8e258b28fcccaf2d6c
Author: Sam Ruby <[email protected]>
AuthorDate: Sat Nov 30 15:08:48 2019 -0500
add collate minutes
---
config/setupmymac | 13 ++++++++++++-
www/board/minutes/.gitignore | 1 -
www/board/minutes/.htaccess | 13 -------------
3 files changed, 12 insertions(+), 15 deletions(-)
diff --git a/config/setupmymac b/config/setupmymac
index 7927152..c09790c 100755
--- a/config/setupmymac
+++ b/config/setupmymac
@@ -122,6 +122,10 @@ OptionParser.new do |opts|
force[:source] = opt
end
+ opts.on('--[no-]minutes', "Collate board minutes") do |opt|
+ force[:minutes] = opt
+ end
+
opts.on('--all', "Update everything") do |opt|
force.default = true
end
@@ -221,7 +225,6 @@ directories = [
'/srv/cache',
'/srv/secretary',
'/srv/secretary/tlpreq',
- '/srv/whimsy/www/board/minutes',
'/srv/whimsy/www/logs',
'/srv/whimsy/www/public',
]
@@ -337,6 +340,14 @@ if force[:git] and Process.uid != 0
run 'rake', 'git:pull'
end
+### Collate minutes
+
+if Process.uid != 0
+ if force[:minutes] or not Dir.exist? '/srv/svn/www/board/minutes'
+ run 'tools/collate_minutes.rb'
+ end
+end
+
### Configure LDAP
if File.exist? "#{WHIMSY}/Gemfile.lock"
diff --git a/www/board/minutes/.gitignore b/www/board/minutes/.gitignore
deleted file mode 100644
index 0b84df0..0000000
--- a/www/board/minutes/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.html
\ No newline at end of file
diff --git a/www/board/minutes/.htaccess b/www/board/minutes/.htaccess
deleted file mode 100644
index 3ce23ec..0000000
--- a/www/board/minutes/.htaccess
+++ /dev/null
@@ -1,13 +0,0 @@
-RedirectMatch ^/board/minutes/stdcxx(\.html)?$
/board/minutes/Cxx_Standard_Library.html
-RedirectMatch ^/board/minutes/comdev(\.html)?$
/board/minutes/Community_Development.html
-RedirectMatch ^/board/minutes/empire-db(\.html)?$
/board/minutes/Empire_db.html
-RedirectMatch ^/board/minutes/httpd(\.html)?$
/board/minutes/HTTP_Server.html
-RedirectMatch ^/board/minutes/logging(\.html)?$
/board/minutes/Logging_Services.html
-RedirectMatch ^/board/minutes/lucenenet(\.html)?$
/board/minutes/Lucene_Net.html
-RedirectMatch ^/board/minutes/climate(\.html)?$
/board/minutes/Open_Climate_Workbench.html
-RedirectMatch ^/board/minutes/apr(\.html)?$
/board/minutes/Portable_Runtime__APR_.html
-RedirectMatch ^/board/minutes/quetz(\.html)?$
/board/minutes/Quetzalcoatl.html
-RedirectMatch ^/board/minutes/trafficcontrol(\.html)?$
/board/minutes/Traffic_Control.html
-RedirectMatch ^/board/minutes/trafficserver(\.html)?$
/board/minutes/Traffic_Server.html
-RedirectMatch ^/board/minutes/ws(\.html)?$
/board/minutes/Web_Services.html
-RedirectMatch ^/board/minutes/xmlgraphics(\.html)?$
/board/minutes/XML_Graphics.html
