normalize secr settings variable names

 - Legacy-Id: 5449

Author: rpcross

ietf/secr/meetings/blue_sheets.py

@@ -16,7 +16,7 @@
 '''
 
 def create_blue_sheets(meeting, groups):
-    file = open(settings.BLUE_SHEET_PATH, 'w')
+    file = open(settings.SECR_BLUE_SHEET_PATH, 'w')
 
     header = '''{\\rtf1\\ansi\\ansicpg1252\\uc1 \\deff0\\deflang1033\\deflangfe1033
  {\\fonttbl{\\f0\\froman\\fcharset0\\fprq2{\\*\\panose 02020603050405020304}Times New Roman;}}
@@ -85,4 +85,4 @@ def create_blue_sheets(meeting, groups):
         file.write(footer)
 
     file.write('\n}')
-    file.close()
+    file.close()

ietf/secr/meetings/views.py

@@ -259,7 +259,7 @@ def blue_sheet(request, meeting_id):
     '''
     meeting = get_object_or_404(Meeting, number=meeting_id)
 
-    url = settings.BLUE_SHEET_URL
+    url = settings.SECR_BLUE_SHEET_URL
 
     if request.method == 'POST':
         form = UploadBlueSheetForm(request.POST,request.FILES)

ietf/secr/middleware/secauth.py

@@ -9,20 +9,20 @@
 class SecAuthMiddleware(object):
     """
     Middleware component that performs custom auth check for every
-    request except those excluded by SEC_AUTH_UNRESTRICTED_URLS.
+    request except those excluded by SECR_AUTH_UNRESTRICTED_URLS.
 
     Since authentication is performed externally at the apache level
     REMOTE_USER should contain the name of the authenticated
     user.  If the user is a secretariat than access is granted.  
     Otherwise return a 401 error page.
 
     To use, add the class to MIDDLEWARE_CLASSES and define
-    SEC_AUTH_UNRESTRCITED_URLS in your settings.py.
+    SECR_AUTH_UNRESTRICTED_URLS in your settings.py.
 
     The following example allows access to anything under "/interim/"
     to non-secretariat users:
 
-    SEC_AUTH_UNRESTRCITED_URLS = (
+    SECR_AUTH_UNRESTRICTED_URLS = (
         (r'^/interim/'),
 
     Also sets custom request attributes:
@@ -35,7 +35,7 @@ class SecAuthMiddleware(object):
 
     def __init__(self):
         self.unrestricted = [re.compile(pattern) for pattern in
-            settings.SEC_AUTH_UNRESTRICTED_URLS]
+            settings.SECR_AUTH_UNRESTRICTED_URLS]
 
     def process_view(self, request, view_func, view_args, view_kwargs):
         # need to initialize user, it doesn't get set when running tests for example

ietf/secr/proceedings/forms.py

@@ -53,8 +53,8 @@ def clean_file(self):
         ext = os.path.splitext(file.name)[1].lower()
         if ext not in VALID_SLIDE_EXTENSIONS:
             raise forms.ValidationError('Only these file types supported for presentation slides: %s' % ','.join(VALID_SLIDE_EXTENSIONS))
-        if file._size > settings.MAX_UPLOAD_SIZE:
-            raise forms.ValidationError('Please keep filesize under %s. Current filesize %s' % (filesizeformat(settings.MAX_UPLOAD_SIZE), filesizeformat(file._size)))
+        if file._size > settings.SECR_MAX_UPLOAD_SIZE:
+            raise forms.ValidationError('Please keep filesize under %s. Current filesize %s' % (filesizeformat(settings.SECR_MAX_UPLOAD_SIZE), filesizeformat(file._size)))
         return file
 
 class UnifiedUploadForm(forms.Form):
@@ -66,8 +66,8 @@ class UnifiedUploadForm(forms.Form):
 
     def clean_file(self):
         file = self.cleaned_data['file']
-        if file._size > settings.MAX_UPLOAD_SIZE:
-            raise forms.ValidationError('Please keep filesize under %s. Current filesize %s' % (filesizeformat(settings.MAX_UPLOAD_SIZE), filesizeformat(file._size)))
+        if file._size > settings.SECR_MAX_UPLOAD_SIZE:
+            raise forms.ValidationError('Please keep filesize under %s. Current filesize %s' % (filesizeformat(settings.SECR_MAX_UPLOAD_SIZE), filesizeformat(file._size)))
         return file
 
     def clean(self):

ietf/secr/proceedings/proc_utils.py

@@ -161,7 +161,7 @@ def create_interim_directory():
     page = 'proceedings.html'
     meetings = InterimMeeting.objects.order_by('-date')
     response = render_to_response('proceedings/interim_directory.html',{'meetings': meetings})
-    path = os.path.join(settings.INTERIM_LISTING_DIR, page)
+    path = os.path.join(settings.SECR_INTERIM_LISTING_DIR, page)
     f = open(path,'w')
     f.write(response.content)
     f.close()
@@ -171,7 +171,7 @@ def create_interim_directory():
     qs = InterimMeeting.objects.all()
     meetings = sorted(qs, key=lambda a: a.group().acronym)
     response = render_to_response('proceedings/interim_directory.html',{'meetings': meetings})
-    path = os.path.join(settings.INTERIM_LISTING_DIR, page)
+    path = os.path.join(settings.SECR_INTERIM_LISTING_DIR, page)
     f = open(path,'w')
     f.write(response.content)
     f.close()
@@ -357,7 +357,7 @@ def gen_areas(context):
             'index': counter}
         )
 
-        path = os.path.join(settings.PROCEEDINGS_DIR,meeting.number,'%s.html' % area.acronym)
+        path = os.path.join(settings.SECR_PROCEEDINGS_DIR,meeting.number,'%s.html' % area.acronym)
         write_html(path,html.content)
 
 def gen_acknowledgement(context):
@@ -367,7 +367,7 @@ def gen_acknowledgement(context):
         'meeting': meeting}
     )
 
-    path = os.path.join(settings.PROCEEDINGS_DIR,meeting.number,'acknowledgement.html')
+    path = os.path.join(settings.SECR_PROCEEDINGS_DIR,meeting.number,'acknowledgement.html')
     write_html(path,html.content)
 
 def gen_agenda(context):
@@ -385,13 +385,13 @@ def gen_agenda(context):
         'timeslots': sort2}
     )
 
-    path = os.path.join(settings.PROCEEDINGS_DIR,meeting.number,'agenda.html')
+    path = os.path.join(settings.SECR_PROCEEDINGS_DIR,meeting.number,'agenda.html')
     write_html(path,html.content)
 
     # get the text agenda from datatracker
     url = 'https://datatracker.ietf.org/meeting/%s/agenda.txt' % meeting.number
     text = urlopen(url).read()
-    path = os.path.join(settings.PROCEEDINGS_DIR,meeting.number,'agenda.txt')
+    path = os.path.join(settings.SECR_PROCEEDINGS_DIR,meeting.number,'agenda.txt')
     write_html(path,text)
 
 def gen_attendees(context):
@@ -404,7 +404,7 @@ def gen_attendees(context):
         'attendees': attendees}
     )
 
-    path = os.path.join(settings.PROCEEDINGS_DIR,meeting.number,'attendee.html')
+    path = os.path.join(settings.SECR_PROCEEDINGS_DIR,meeting.number,'attendee.html')
     write_html(path,html.content)
 
 def gen_group_pages(context):
@@ -415,7 +415,7 @@ def gen_group_pages(context):
 
 def gen_index(context):
     index = render_to_response('proceedings/index.html',context)
-    path = os.path.join(settings.PROCEEDINGS_DIR,context['meeting'].number,'index.html')
+    path = os.path.join(settings.SECR_PROCEEDINGS_DIR,context['meeting'].number,'index.html')
     write_html(path,index.content)
 
 def gen_irtf(context):
@@ -425,7 +425,7 @@ def gen_irtf(context):
     html = render_to_response('proceedings/irtf.html',{
         'irtf_chair':irtf_chair}
     )
-    path = os.path.join(settings.PROCEEDINGS_DIR,meeting.number,'irtf.html')
+    path = os.path.join(settings.SECR_PROCEEDINGS_DIR,meeting.number,'irtf.html')
     write_html(path,html.content)
 
 def gen_overview(context):
@@ -441,7 +441,7 @@ def gen_overview(context):
         'ads': sorted_ads}
     )
 
-    path = os.path.join(settings.PROCEEDINGS_DIR,meeting.number,'overview.html')
+    path = os.path.join(settings.SECR_PROCEEDINGS_DIR,meeting.number,'overview.html')
     write_html(path,html.content)
 
 def gen_plenaries(context):
@@ -462,7 +462,7 @@ def gen_plenaries(context):
             'slides': admin_slides,
             'minutes': admin_minutes}
         )
-        path = os.path.join(settings.PROCEEDINGS_DIR,context['meeting'].number,'administrative-plenary.html')
+        path = os.path.join(settings.SECR_PROCEEDINGS_DIR,context['meeting'].number,'administrative-plenary.html')
         write_html(path,admin.content)
     except Session.DoesNotExist:
         pass
@@ -478,7 +478,7 @@ def gen_plenaries(context):
             'slides': tech_slides,
             'minutes': tech_minutes}
         )
-        path = os.path.join(settings.PROCEEDINGS_DIR,context['meeting'].number,'technical-plenary.html')
+        path = os.path.join(settings.SECR_PROCEEDINGS_DIR,context['meeting'].number,'technical-plenary.html')
         write_html(path,tech.content)
     except Session.DoesNotExist:
         pass
@@ -504,7 +504,7 @@ def gen_progress(context, final=True):
 
     html = render_to_response('proceedings/progress.html',data)
 
-    path = os.path.join(settings.PROCEEDINGS_DIR,meeting.number,'progress-report.html')
+    path = os.path.join(settings.SECR_PROCEEDINGS_DIR,meeting.number,'progress-report.html')
     write_html(path,html.content)
 
 def gen_research(context):
@@ -522,7 +522,7 @@ def gen_research(context):
         'groups': groups}
     )
 
-    path = os.path.join(settings.PROCEEDINGS_DIR,meeting.number,'rg_irtf.html')
+    path = os.path.join(settings.SECR_PROCEEDINGS_DIR,meeting.number,'rg_irtf.html')
     write_html(path,html.content)
 
 def gen_training(context):
@@ -538,6 +538,6 @@ def gen_training(context):
             'slides': slides,
             'minutes': minutes}
         )
-        path = os.path.join(settings.PROCEEDINGS_DIR,meeting.number,'train-%s.html' % counter )
+        path = os.path.join(settings.SECR_PROCEEDINGS_DIR,meeting.number,'train-%s.html' % counter )
         write_html(path,html.content)
 

ietf/secr/proceedings/views.py

@@ -219,7 +219,7 @@ def ajax_generate_proceedings(request, meeting_num):
     proceedings_url = get_proceedings_url(meeting)
 
     # the acknowledgement page can be edited manually so only produce if it doesn't already exist
-    path = os.path.join(settings.PROCEEDINGS_DIR,meeting.number,'acknowledgement.html')
+    path = os.path.join(settings.SECR_PROCEEDINGS_DIR,meeting.number,'acknowledgement.html')
     if not os.path.exists(path):
         gen_acknowledgement(context)
     gen_overview(context)
@@ -235,7 +235,7 @@ def ajax_generate_proceedings(request, meeting_num):
     gen_group_pages(context)
 
     # get the time proceedings were generated
-    path = os.path.join(settings.PROCEEDINGS_DIR,meeting.number,'index.html')
+    path = os.path.join(settings.SECR_PROCEEDINGS_DIR,meeting.number,'index.html')
     last_run = datetime.datetime.fromtimestamp(os.path.getmtime(path))
 
     return render_to_response('includes/proceedings_functions.html',{
@@ -550,7 +550,7 @@ def process_pdfs(request, meeting_num):
     for doc in itertools.chain(ppt,pptx):
         base,ext = os.path.splitext(doc.external_url)
         pdf_file = base + '.pdf'
-        path = os.path.join(settings.PROCEEDINGS_DIR,meeting_num,'slides',pdf_file)
+        path = os.path.join(settings.SECR_PROCEEDINGS_DIR,meeting_num,'slides',pdf_file)
         if os.path.exists(path):
             doc.external_url = pdf_file
             doc.save()
@@ -653,7 +653,7 @@ def select(request, meeting_num):
     proceedings_url = get_proceedings_url(meeting)
 
     # get the time proceedings were generated
-    path = os.path.join(settings.PROCEEDINGS_DIR,meeting.number,'index.html')
+    path = os.path.join(settings.SECR_PROCEEDINGS_DIR,meeting.number,'index.html')
     if os.path.exists(path):
         last_run = datetime.datetime.fromtimestamp(os.path.getmtime(path))
     else:

ietf/secr/sreq/views.py

@@ -28,7 +28,7 @@
 # Globals
 # -------------------------------------------------
 SESSION_REQUEST_EMAIL = 'session-request@ietf.org'
-LOCKFILE = os.path.join(settings.PROCEEDINGS_DIR,'session_request.lock')
+LOCKFILE = os.path.join(settings.SECR_PROCEEDINGS_DIR,'session_request.lock')
 # -------------------------------------------------
 # Helper Functions
 # -------------------------------------------------

ietf/settings.py

@@ -161,7 +161,7 @@
     'ietf.liaisons',
     'ietf.mailinglists',
     'ietf.meeting',
-    'ietf.proceedings',
+    #'ietf.proceedings',
     'ietf.redirects',
     'ietf.idrfc',
     'ietf.wginfo',
@@ -178,7 +178,7 @@
     'ietf.secr.groups',
     'ietf.secr.ipradmin',
     'ietf.secr.meetings',
-    #'ietf.secr.proceedings',
+    'ietf.secr.proceedings',
     'ietf.secr.roles',
     'ietf.secr.rolodex',
     'ietf.secr.telechat',
@@ -326,19 +326,19 @@
 CHANGELOG_PATH = '/www/ietf-datatracker/web/changelog'
 
 # Secretariat Tool
-BLUE_SHEET_PATH = '/a/www/ietf-datatracker/documents/blue_sheet.rtf'
-BLUE_SHEET_URL = 'https://datatracker.ietf.org/documents/blue_sheet.rtf'
-INTERIM_LISTING_DIR = '/a/www/www6/meeting/interim'
-MAX_UPLOAD_SIZE = 40960000
-PROCEEDINGS_DIR = '/a/www/www6s/proceedings/'
 # this is a tuple of regular expressions.  if the incoming URL matches one of
 # these, than non secretariat access is allowed.
-SEC_AUTH_UNRESTRICTED_URLS = (
+SECR_AUTH_UNRESTRICTED_URLS = (
     #(r'^/$'),
-    #(r'^/announcement/'),
-    #(r'^/proceedings/'),
+    (r'^/secr/announcement/'),
+    (r'^/secr/proceedings/'),
     (r'^/secr/sreq/'),
 )
+SECR_BLUE_SHEET_PATH = '/a/www/ietf-datatracker/documents/blue_sheet.rtf'
+SECR_BLUE_SHEET_URL = 'https://datatracker.ietf.org/documents/blue_sheet.rtf'
+SECR_INTERIM_LISTING_DIR = '/a/www/www6/meeting/interim'
+SECR_MAX_UPLOAD_SIZE = 40960000
+SECR_PROCEEDINGS_DIR = '/a/www/www6s/proceedings/'
 SECR_STATIC_URL = '/secr-static/'
 
 # Put SECRET_KEY in here, or any other sensitive or site-specific