View | Details | Raw Unified | Return to bug 46438
Collapse All | Expand All

(-)a/40univention-google-apps.inst (-10 / +1 lines)
 Lines 228-243   if ! udm mail/domain list "$@" | grep -q "name: $domainname" ; then Link Here 
228 
fi
 228 
fi
229 

          229
          

        

        

          230
          
if joinscript_check_version_in_range_executed 1 1; then

          230
          
if joinscript_check_version_in_range_executed 1 1; then

        

          
            

              231
              
	python -c "from univention.googleapps.auth import GappsAuth, NoCredentials, CredentialsStorageError


              231
              
	/usr/share/univention-google-apps/update_saml_configuration || die

            

            

              232
              
try:


              
              
            

            

              233
              
	domain = GappsAuth.get_domain()


            

            

              234
              
	GappsAuth.update_saml_configuration(domain)


            

            

              235
              
except NoCredentials as exc:


            

            

              236
              
	print 'No current connection configured for Google Apps. The saml configuration will not be changed'


            

            

              237
              
	exit(0)


            

            

              238
              
except CredentialsStorageError as exc:


            

            

              239
              
	print 'An error prevented the saml configuration to get updated: %s' % exc


            

            

              240
              
	exit(1)" || die


            

        

          241
          
fi

          232
          
fi

        

        

          242
          

          233
          

        

        

          243
          
stop_udm_cli_server

          234
          
stop_udm_cli_server

        



(-)a/debian/univention-google-apps.install
      (+1 lines)




  

    

    

       Lines 8-12
      google-apps.schema usr/share/univention-google-apps/ 
    
  Link Here 
    

  

        

          8
          
google-apps-for-work.php usr/share/univention-google-apps/

          8
          
google-apps-for-work.php usr/share/univention-google-apps/

        

        

          9
          
print_google_users_and_groups usr/share/univention-google-apps/

          9
          
print_google_users_and_groups usr/share/univention-google-apps/

        

        

          10
          
convert_credentials_file usr/share/univention-google-apps/

          10
          
convert_credentials_file usr/share/univention-google-apps/

        

            

              
              
              11
              
update_saml_configuration usr/share/univention-google-apps/

            

        

          11
          
umc/icons/googleapps.png var/www

          12
          
umc/icons/googleapps.png var/www

        

        

          12
          
google_primary_address.py usr/share/pyshared/univention/admin/hooks.d/

          13
          
google_primary_address.py usr/share/pyshared/univention/admin/hooks.d/

        



(-)a/update_saml_configuration
      (+18 lines)




  

    

    

      Line 0
       
    
  Link Here 
    

  

            

              
              
              1
              
import sys

            

            

              2
              
from univention.googleapps.auth import GappsAuth, NoCredentials, CredentialsStorageError

            

            

              3
              

            

            

              4
              

            

            

              5
              
def update_saml_configuration():

            

            

              6
              
	try:

            

            

              7
              
		domain = GappsAuth.get_domain()

            

            

              8
              
		GappsAuth.update_saml_configuration(domain)

            

            

              9
              
	except NoCredentials as exc:

            

            

              10
              
		print('No current connection configured for Google Apps. The saml configuration will not be changed')

            

            

              11
              
		sys.exit(0)

            

            

              12
              
	except CredentialsStorageError as exc:

            

            

              13
              
		print('An error prevented the saml configuration to get updated: {}'.format(exc))

            

            

              14
              
		sys.exit(1)

            

            

              15
              

            

            

              16
              

            

            

              17
              
if __name__ == "__main__":

            

            

              18
              
	update_saml_configuration()

            






  

  Return to bug 46438