diff --git a/api/src/Kurs.Platform.HttpApi.Host/appsettings.Production.json b/api/src/Kurs.Platform.HttpApi.Host/appsettings.Production.json index fcedfd8e..218439d6 100644 --- a/api/src/Kurs.Platform.HttpApi.Host/appsettings.Production.json +++ b/api/src/Kurs.Platform.HttpApi.Host/appsettings.Production.json @@ -2,7 +2,7 @@ "App": { "SelfUrl": "https://kurs-api.sozsoft.com", "ClientUrl": "https://kurs.sozsoft.com", - "CorsOrigins": "https://kurs.sozsoft.com", + "CorsOrigins": "https://kurs.sozsoft.com,https://demo.sozsoft.com", "RedirectAllowedUrls": "https://kurs.sozsoft.com,https://kurs.sozsoft.com/authentication/callback", "AttachmentsPath": "/etc/api/mail-queue/attachments", "CdnPath": "/etc/api/cdn" diff --git a/company/src/components/home/Hero.tsx b/company/src/components/home/Hero.tsx index 4b5a1e32..b74c4ab6 100644 --- a/company/src/components/home/Hero.tsx +++ b/company/src/components/home/Hero.tsx @@ -27,7 +27,7 @@ const Hero: React.FC = () => {
{t('hero.cta.consultation')} diff --git a/configs/deployment/Readme_Devops.md b/configs/deployment/Readme_Devops.md index f5457245..194631a8 100644 --- a/configs/deployment/Readme_Devops.md +++ b/configs/deployment/Readme_Devops.md @@ -105,9 +105,12 @@ - sedat.ozturk isimli kullanıcı tanımlanacak. - "kurs" isimli new organization tanımlanacak. - "kurs-platform" isimli repository kurs organizasyonunun içerisine tanımlanacak. - - Fork üzerinden Remotes tanımlaması yapılacak. Remote: devops.sozsoft.com RepositoryUrl: https://devops.sozsoft.com/kurs/kurs-platform - - Fork üzerinden Authorization işlemi yapılacak URL kısmı localhost olarak geliyor. Onu devops.sozsoft.com olarak değiştirmek gerekiyor. - + - Fork üzerinden https://devops.sozsoft.com/user/settings/applications kısmına "sozsoft.com" ismiyle Access Token ekle. Eklenen token bilgisi Fork içerisinde kullanılacak. + - Fork üzerinden Remotes tanımlaması yapılacak. + Remote: devops.sozsoft.com + RepositoryUrl: https://sedat.ozturk:1b48921c4cc6cd5c79e8ac121ede9f78afd1d9be@devops.sozsoft.com/kurs/kurs-platform.git + - https://devops.sozsoft.com/user/settings/applications sayfasında OAuth2 kısmında "sozsoft.com" ismiyle Application Name eklenecek. Redirect URL kısmında https://devops.sozsoft.com eklenecektir. + ## docker-compose-devops.yml kurulumu Bu kurulumu yapmak için home klasörü altına 3 tane dosyaya ihtiyaç duyuyor. diff --git a/configs/deployment/configs/nginx.conf b/configs/deployment/configs/nginx.conf index 886f7116..29beb121 100644 --- a/configs/deployment/configs/nginx.conf +++ b/configs/deployment/configs/nginx.conf @@ -63,24 +63,6 @@ server { } } -# kurs.sozsoft.com -server { - listen 443 ssl http2; - server_name kurs.sozsoft.com; - - ssl_certificate /etc/ssl/sozsoft.com/cert1.pem; - ssl_certificate_key /etc/ssl/sozsoft.com/privkey1.pem; - - underscores_in_headers on; - ignore_invalid_headers off; - large_client_header_buffers 4 16k; - - location / { - proxy_pass http://127.0.0.1:3002; # ← PORT belirtildi - include /etc/nginx/proxy_params; - } -} - # sozsoft.com server { listen 443 ssl http2; @@ -126,3 +108,21 @@ server { include /etc/nginx/proxy_params; } } + +# *.sozsoft.com +server { + listen 443 ssl http2; + server_name *.sozsoft.com; + + ssl_certificate /etc/ssl/sozsoft.com/cert1.pem; + ssl_certificate_key /etc/ssl/sozsoft.com/privkey1.pem; + + underscores_in_headers on; + ignore_invalid_headers off; + large_client_header_buffers 4 16k; + + location / { + proxy_pass http://127.0.0.1:3002; # ← PORT belirtildi + include /etc/nginx/proxy_params; + } +} diff --git a/configs/deployment/scripts/3-build-dev.sh b/configs/deployment/scripts/8-build-dev.sh similarity index 100% rename from configs/deployment/scripts/3-build-dev.sh rename to configs/deployment/scripts/8-build-dev.sh diff --git a/configs/deployment/scripts/4-deploy-dev.sh b/configs/deployment/scripts/9-deploy-dev.sh similarity index 100% rename from configs/deployment/scripts/4-deploy-dev.sh rename to configs/deployment/scripts/9-deploy-dev.sh diff --git a/ui/src/views/auth/Login.tsx b/ui/src/views/auth/Login.tsx index 2046849b..de1a8036 100644 --- a/ui/src/views/auth/Login.tsx +++ b/ui/src/views/auth/Login.tsx @@ -61,6 +61,8 @@ const Login = () => { const { signIn } = useAuth() const { translate } = useLocalization() + const defaultSubDomain = 'KURS' + const getSubdomain = () => { if (typeof window === 'undefined') return null @@ -72,6 +74,10 @@ const Login = () => { return null } + if (parts[0].toUpperCase() === defaultSubDomain) { + return null + } + if (parts[0] === 'www') { return parts[1] } @@ -168,10 +174,9 @@ const Login = () => { } const subDomainName = getSubdomain() - //const subDomainName = 'KURS2' const tenantId = useStoreState((a) => a.auth.tenantId) ?? subDomainName const tenantStyle: React.CSSProperties | undefined = - subDomainName && subDomainName !== 'KURS' + subDomainName && subDomainName !== defaultSubDomain ? { opacity: 0, position: 'absolute', @@ -211,7 +216,7 @@ const Login = () => { value={tenantId || ''} onChange={(e) => setTenantId(e.target.value)} style={tenantStyle} - aria-hidden={subDomainName && subDomainName !== 'KURS' ? 'true' : 'false'} + //aria-hidden={subDomainName && subDomainName !== defaultSubDomain ? 'true' : 'false'} />
diff --git a/ui/vite.config.ts b/ui/vite.config.ts index cd9605b9..b5611466 100644 --- a/ui/vite.config.ts +++ b/ui/vite.config.ts @@ -62,6 +62,6 @@ export default defineConfig({ host: '0.0.0.0', port: 80, open: false, - allowedHosts: ['kurs-dev.sozsoft.com', 'kurs.sozsoft.com', 'localhost'], + allowedHosts: ['kurs-dev.sozsoft.com', 'kurs.sozsoft.com', 'localhost', 'demo.sozsoft.com'], }, })