View | Details | Raw Unified | Return to bug 256832 | Differences between
and this patch

Collapse All | Expand All

(-)b/sysutils/py-salt/Makefile (-1 / +2 lines)
Lines 22-28 RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \ Link Here
22 
		${PYTHON_PKGNAMEPREFIX}psutil>=0.3.0:sysutils/py-psutil@${PY_FLAVOR} \
 22 
		${PYTHON_PKGNAMEPREFIX}psutil>=0.3.0:sysutils/py-psutil@${PY_FLAVOR} \
23 
		${PYTHON_PKGNAMEPREFIX}requests>=1.0.0:www/py-requests@${PY_FLAVOR} \
 23 
		${PYTHON_PKGNAMEPREFIX}requests>=1.0.0:www/py-requests@${PY_FLAVOR} \
24 
		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \
 24 
		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \
25 
		${PYTHON_PKGNAMEPREFIX}pyinotify>0:devel/py-pyinotify@${PY_FLAVOR}
 25 
		${PYTHON_PKGNAMEPREFIX}pyinotify>0:devel/py-pyinotify@${PY_FLAVOR} \
26 
			${PYTHON_PKGNAMEPREFIX}setproctitle>=1.1.10:devel/py-setproctitle@${PY_FLAVOR} \
26 

          27
          

        

        

          27
          
USES=		cpe python:3.6-3.8

          28
          
USES=		cpe python:3.6-3.8

        

        

          28
          

          29
          

        



(-)b/sysutils/py-salt/files/salt_api.in
      (-1 / +1 lines)




  

    
      
            Lines 22-28
          load_rc_config ${name}
      
      
        Link Here
      
    
  

        

          22
          
: ${salt_api_enable:=NO}

          22
          
: ${salt_api_enable:=NO}

        

        

          23
          

          23
          

        

        

          24
          
command="%%PREFIX%%/bin/salt-api"

          24
          
command="%%PREFIX%%/bin/salt-api"

        

          
            

              25
              
command_interpreter="%%PYTHON_CMD%%"


              25
              
procname="%%PYTHON_CMD%%"

            

        

          26
          
required_files="%%PREFIX%%/etc/salt"

          26
          
required_files="%%PREFIX%%/etc/salt"

        

        

          27
          
command_args="-c ${required_files} -d"

          27
          
command_args="-c ${required_files} -d"

        

        

          28
          

          28
          

        



(-)b/sysutils/py-salt/files/salt_master.in
      (-1 / +1 lines)




  

    
      
            Lines 29-35
          load_rc_config ${name}
      
      
        Link Here
      
    
  

        

          29
          
: ${salt_master_eggcache=/tmp}

          29
          
: ${salt_master_eggcache=/tmp}

        

        

          30
          

          30
          

        

        

          31
          
command="%%PREFIX%%/bin/salt-master"

          31
          
command="%%PREFIX%%/bin/salt-master"

        

          
            

              32
              
command_interpreter="%%PYTHON_CMD%%"


              32
              
procname="%%PYTHON_CMD%%"

            

        

          33
          
required_files="%%PREFIX%%/etc/salt"

          33
          
required_files="%%PREFIX%%/etc/salt"

        

        

          34
          
command_args="-c ${required_files} -d"

          34
          
command_args="-c ${required_files} -d"

        

        

          35
          
pidfile=${salt_master_pidfile}

          35
          
pidfile=${salt_master_pidfile}

        



(-)b/sysutils/py-salt/files/salt_minion.in
      (-1 / +1 lines)




  

    
      
            Lines 29-35
          load_rc_config ${name}
      
      
        Link Here
      
    
  

        

          29
          
: ${salt_minion_eggcache=/tmp}

          29
          
: ${salt_minion_eggcache=/tmp}

        

        

          30
          

          30
          

        

        

          31
          
command="%%PREFIX%%/bin/salt-minion"

          31
          
command="%%PREFIX%%/bin/salt-minion"

        

          
            

              32
              
command_interpreter="%%PYTHON_CMD%%"


              32
              
procname="%%PYTHON_CMD%%"

            

        

          33
          
required_files="%%PREFIX%%/etc/salt"

          33
          
required_files="%%PREFIX%%/etc/salt"

        

        

          34
          
command_args="-c ${required_files} -d"

          34
          
command_args="-c ${required_files} -d"

        

        

          35
          
pidfile=${salt_minion_pidfile}

          35
          
pidfile=${salt_minion_pidfile}

        



(-)b/sysutils/py-salt/files/salt_proxy.in
      (-2 / +2 lines)




  

    
      
            Lines 32-38
          load_rc_config ${name}
      
      
        Link Here
      
    
  

        

          32
          
start_cmd=salt_proxy_start

          32
          
start_cmd=salt_proxy_start

        

        

          33
          

          33
          

        

        

          34
          
command="%%PREFIX%%/bin/salt-proxy"

          34
          
command="%%PREFIX%%/bin/salt-proxy"

        

          
            

              35
              
command_interpreter="%%PYTHON_CMD%%"


              35
              
procname="%%PYTHON_CMD%%"

            

        

          36
          
required_files="%%PREFIX%%/etc/salt"

          36
          
required_files="%%PREFIX%%/etc/salt"

        

        

          37
          
command_args="-c ${required_files} -d"

          37
          
command_args="-c ${required_files} -d"

        

        

          38
          

          38
          

        

  

    
      
            Lines 50-56
          salt_proxy_start()
      
      
        Link Here
      
    
  

        

          50
          

          50
          

        

        

          51
          
    for _proxy in ${salt_proxy_list}; do

          51
          
    for _proxy in ${salt_proxy_list}; do

        

        

          52
          
        echo "Starting salt-proxy: ${_proxy}"

          52
          
        echo "Starting salt-proxy: ${_proxy}"

        

          
            

              53
              
        ${command_interpreter} ${command} --proxyid ${_proxy} ${command_args}


              53
              
        ${procname} ${command} --proxyid ${_proxy} ${command_args}

            

        

          54
          
    done

          54
          
    done

        

        

          55
          
}

          55
          
}

        

        

          56
          

          56
          

        



(-)b/sysutils/py-salt/files/salt_syndic.in
      (-1 / +1 lines)




  

    
      
            Lines 22-28
          load_rc_config ${name}
      
      
        Link Here
      
    
  

        

          22
          
: ${salt_syndic_enable:=NO}

          22
          
: ${salt_syndic_enable:=NO}

        

        

          23
          

          23
          

        

        

          24
          
command="%%PREFIX%%/bin/salt-syndic"

          24
          
command="%%PREFIX%%/bin/salt-syndic"

        

          
            

              25
              
command_interpreter="%%PYTHON_CMD%%"


              25
              
procname="%%PYTHON_CMD%%"

            

        

          26
          
required_files="%%PREFIX%%/etc/salt"

          26
          
required_files="%%PREFIX%%/etc/salt"

        

        

          27
          
command_args="-c ${required_files} -d"

          27
          
command_args="-c ${required_files} -d"

        

        

          28
          

          28
          

        






  

  Return to bug 256832