Commits

sodas tsai  committed 385d9d9

Fix sed issue when updating gitignore

  • Participants
  • Parent commits c1d7ee1

Comments (0)

Files changed (4)

File beanstalk/__init__.py

 
 # Pacakge information
 #-----------------------------------------------------------------------------------------------------------------------
-__version__ = '0.1.86'
+__version__ = '0.1.87'
 VERSION = tuple(map(lambda x: int(x), __version__.split('.')))
 BEANSTALK_ROOT_PATH = os.path.abspath(os.path.dirname(__file__))
 

File beanstalk/tasks/app.py

 def plant(VERBOSE=0):
     """plant beanstalk-stack for project in current work directory
     """
+    # TODO: Python Package
     set_verbose_level(VERBOSE)
     # Create beanstalk_stack home
     beanstalk_local_base_path = os.path.normpath(os.path.join(os.getcwd(), BEANSTALK_LOCAL_BASE_PATH))
 
             # We wanna preserve pyc/pyo files in our remote
             # Remove *.pyc, *.pyo, *.py[co] in ignore patterns and append "logs/" in the ignore file
-            local(
-                'sed -i.bak -e '
-                '\'/^\*\.py[c|o]$/d;/^\*\.py\[co\]$/d;$a\\\nlogs\/;$a\\\nvenv\/\''
-                ' {path} && rm -rf {path}.bak'.format(path='.gitignore')
-            )
+            local('sed -i.bak -e "/^\*\.py[c|o]$/d" {path} && rm -rf {path}.bak'.format(path='.gitignore'))
+            local('sed -i.bak -e \'$ a\\\nlogs/\' {path} && rm -rf {path}.bak'.format(path='.gitignore'))
+            local('sed -i.bak -e \'$ a\\\nvenv/\' {path} && rm -rf {path}.bak'.format(path='.gitignore'))
 
             # Check source code first
             run_hooked_actions('SOURCE_CHECK_ACTIONS')

File beanstalk/tasks/server.py

     if not os.path.exists('/etc/httpd/conf.d/beanstalk_app.conf'):
         local('ln -s %s /etc/httpd/conf.d/beanstalk_app.conf' % apache_conf_path())
 
+    # TODO: SELINUX
+    #chcon -t httpd_config_t -u system_u -r object_r uwsgi.conf
+    #chcon -t httpd_config_t -u system_u -r object_r beanstalk_app.conf
+    #chcon -t httpd_config_t -u system_u -r object_r beanstalk.conf
+
     print section_title('Final setup')
     local('chown -R beanstalk:beanstalk %s' % beanstalk_stack_base)
     with settings(hide('warnings'), warn_only=True):

File requirements.txt

 Jinja2==2.6
 Pygments==1.6rc1
 Sphinx==1.1.3
-caktus-sphinx-theme==0.1.0
 docutils==0.10
 ground-soil==0.1.12
 netaddr==0.7.10